diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-09 13:04:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-09 13:05:04 +0100 |
| commit | 1d9a93682da052d2e87555fab368e8d79f3b8de2 (patch) | |
| tree | 77506aa41773c6a78660c582c260f8f673cdf7cc | |
| parent | 51c580102d4d189d657bd322372e663fcf756cdd (diff) | |
| parent | 772f50c1f3e4a50ce3f35e31a6f0cd64e7cbe818 (diff) | |
| download | ffmpeg-1d9a93682da052d2e87555fab368e8d79f3b8de2.tar.gz | |
Merge commit '772f50c1f3e4a50ce3f35e31a6f0cd64e7cbe818' into release/2.2
* commit '772f50c1f3e4a50ce3f35e31a6f0cd64e7cbe818':
rv10: check size of s->mb_width * s->mb_height
Conflicts:
libavcodec/rv10enc.c
See: 2578a546183da09d49d5bba8ab5e982dece1dede
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/rv10enc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/rv10enc.c b/libavcodec/rv10enc.c index ae4993c81b..cc15bc7c86 100644 --- a/libavcodec/rv10enc.c +++ b/libavcodec/rv10enc.c @@ -49,7 +49,8 @@ int ff_rv10_encode_picture_header(MpegEncContext *s, int picture_number) to display the macroblocks is coded here */ if(!full_frame){ if (s->mb_width * s->mb_height >= (1U << 12)) { - avpriv_report_missing_feature(s, "Encoding frames with 4096 or more macroblocks"); + avpriv_report_missing_feature(s->avctx, "Encoding frames with %d (>= 4096) macroblocks", + s->mb_width * s->mb_height); return AVERROR(ENOSYS); } put_bits(&s->pb, 6, 0); /* mb_x */ |