diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-05 19:41:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-05 19:43:25 +0100 |
| commit | 31559723ab453ea12953c7f1d4024717dfff6c6e (patch) | |
| tree | 734433ebb4e9884a2480d3d9435b3eaf9948105d /libavcodec/rv10enc.c | |
| parent | 8c013a9e55d9065793ef7ca6459d1178927a2b35 (diff) | |
| parent | 66624ed6319cb1a959256fe1a717fec5b748fbfa (diff) | |
Merge commit '66624ed6319cb1a959256fe1a717fec5b748fbfa'
* commit '66624ed6319cb1a959256fe1a717fec5b748fbfa':
rv10: check size of s->mb_width * s->mb_height
Conflicts:
libavcodec/rv10enc.c
See: 2578a546183da09d49d5bba8ab5e982dece1dede
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rv10enc.c')
| -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 37efe6cca4..45f11365c9 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 */ |