Merge commit '49f9c4272c4029b57ff300d908ba03c6332fc9c4'

[ffmpeg] / libavcodec / asvenc.c

diff --git a/libavcodec/asvenc.c b/libavcodec/asvenc.c
index c4eca2a13d6aee1bef02b2d51eb827717ecceb0c..3cc94bf91a291276d21ca0005c1687bc8af8bde6 100644 (file)
--- a/libavcodec/asvenc.c
+++ b/libavcodec/asvenc.c
@@ -173,10 +173,7 @@ static inline int encode_mb(ASV1Context *a, int16_t block[6][64])
 {
     int i;
 
-    if (a->pb.buf_end - a->pb.buf - (put_bits_count(&a->pb) >> 3) < MAX_MB_SIZE) {
-        av_log(a->avctx, AV_LOG_ERROR, "encoded frame too large\n");
-        return -1;
-    }
+    av_assert0(a->pb.buf_end - a->pb.buf - (put_bits_count(&a->pb) >> 3) >= MAX_MB_SIZE);
 
     if (a->avctx->codec_id == AV_CODEC_ID_ASV1) {
         for (i = 0; i < 6; i++)