Merge commit '8aee35acb1b40e51a4fc8d7f7c561088e25d6d2e' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Mar 2015 00:23:06 +0000 (01:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Mar 2015 00:23:24 +0000 (01:23 +0100)
* 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>
libavcodec/rv10enc.c

index 37efe6c..45f1136 100644 (file)
@@ -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 */