X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fwmaenc.c;h=4ad37cc70bdc12625d65156a89091281e5a2df2c;hb=0181162bb54ce62ec212436a12d059726d8cd1df;hp=091bc2ac3b91b1e05cb0c8aae0633525b86ea144;hpb=bec3b2041dcc20ab4b06a6b31d09130e1a7166c3;p=ffmpeg diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c index 091bc2ac3b9..4ad37cc70bd 100644 --- a/libavcodec/wmaenc.c +++ b/libavcodec/wmaenc.c @@ -343,7 +343,7 @@ static int encode_block(WMACodecContext *s, float (*src_coefs)[BLOCK_MAX_SIZE], s->coef_vlcs[tindex]->huffcodes[1]); } if (s->version == 1 && s->avctx->channels >= 2) - avpriv_align_put_bits(&s->pb); + align_put_bits(&s->pb); } return 0; } @@ -358,7 +358,7 @@ static int encode_frame(WMACodecContext *s, float (*src_coefs)[BLOCK_MAX_SIZE], else if (encode_block(s, src_coefs, total_gain) < 0) return INT_MAX; - avpriv_align_put_bits(&s->pb); + align_put_bits(&s->pb); return put_bits_count(&s->pb) / 8 - s->avctx->block_align; } @@ -408,7 +408,7 @@ static int encode_superframe(AVCodecContext *avctx, AVPacket *avpkt, return AVERROR(EINVAL); } av_assert0((put_bits_count(&s->pb) & 7) == 0); - i= avctx->block_align - (put_bits_count(&s->pb)+7)/8; + i = avctx->block_align - put_bytes_count(&s->pb, 0); av_assert0(i>=0); while(i--) put_bits(&s->pb, 8, 'N');