Commit 5d652e06 authored by Justin Ruggles's avatar Justin Ruggles

wmaenc: check final frame size against output packet size

Currently we have an assert() that prevents the frame from being too large,
but it is more user-friendly to give an error message instead of aborting on
assert(). This condition is quite unlikely due to the minimum bit rate check
in encode_init(), but it is still worth having.
parent dfc4fded
......@@ -394,11 +394,13 @@ static int encode_superframe(AVCodecContext *avctx,
}
#endif
encode_frame(s, s->coefs, buf, buf_size, total_gain);
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);
}
assert((put_bits_count(&s->pb) & 7) == 0);
i= s->block_align - (put_bits_count(&s->pb)+7)/8;
assert(i>=0);
while(i--)
while (i++)
put_bits(&s->pb, 8, 'N');
flush_put_bits(&s->pb);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment