[FFmpeg-cvslog] Revert "wmaenc: check final frame size against output packet size"

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar  5 07:24:16 2012 +0100| [c99bd29462e1735ff85980e57ee57e55d1cc6745] | committer: Michael Niedermayer

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.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c99bd29462e1735ff85980e57ee57e55d1cc6745
---

 libavcodec/wmaenc.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c
index 29baa10..c15df65 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);