From c99bd29462e1735ff85980e57ee57e55d1cc6745 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 5 Mar 2012 07:24:16 +0100 Subject: [PATCH] Revert "wmaenc: check final frame size against output packet size" This condition cannot happen, if it can it is a bug that MUST be fixed. And i very happily volunteer to fix it if someone reports a case to me that fails. This reverts commit 5d652e063bd3a180f9de8915e5137aa4f938846d. --- libavcodec/wmaenc.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c index 29baa10230..c15df65ba8 100644 --- a/libavcodec/wmaenc.c +++ b/libavcodec/wmaenc.c @@ -396,13 +396,11 @@ static int encode_superframe(AVCodecContext *avctx, } #endif - if ((i = encode_frame(s, s->coefs, buf, buf_size, total_gain)) >= 0) { - av_log(avctx, AV_LOG_ERROR, "required frame size too large. please " - "use a higher bit rate.\n"); - return AVERROR(EINVAL); - } + encode_frame(s, s->coefs, buf, buf_size, total_gain); assert((put_bits_count(&s->pb) & 7) == 0); - while (i++) + i= s->block_align - (put_bits_count(&s->pb)+7)/8; + assert(i>=0); + while(i--) put_bits(&s->pb, 8, 'N'); flush_put_bits(&s->pb);