Merge commit '66624ed6319cb1a959256fe1a717fec5b748fbfa'

* commit '66624ed6319cb1a959256fe1a717fec5b748fbfa':
  rv10: check size of s->mb_width * s->mb_height

Conflicts:
	libavcodec/rv10enc.c

See: 2578a54618
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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 */