diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-09 01:23:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-09 01:23:24 +0100 |
| commit | f2a84d04331d8179a3cac1adcdef9de1b5c3f1e9 (patch) | |
| tree | 801cf08605e852d9dbc39446b5015b647273d36a | |
| parent | d08db138e2109725ba2963f152b0a2b1fffded1b (diff) | |
| parent | 8aee35acb1b40e51a4fc8d7f7c561088e25d6d2e (diff) | |
| download | ffmpeg-f2a84d04331d8179a3cac1adcdef9de1b5c3f1e9.tar.gz | |
Merge commit '8aee35acb1b40e51a4fc8d7f7c561088e25d6d2e' into release/2.4
* commit '8aee35acb1b40e51a4fc8d7f7c561088e25d6d2e':
rv10: check size of s->mb_width * s->mb_height
Conflicts:
libavcodec/rv10enc.c
See: d08db138e2109725ba2963f152b0a2b1fffded1b
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 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 */ |