Merge commit 'c80a816142699dea9cf9fa66689a7838a487ed7e'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 13 Oct 2014 22:03:43 +0000 (00:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 13 Oct 2014 22:04:18 +0000 (00:04 +0200)
* commit 'c80a816142699dea9cf9fa66689a7838a487ed7e':
  h263dec: call get_format() on resolution changes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h263dec.c

index c5e38fd..4ef7825 100644 (file)
@@ -548,6 +548,12 @@ retry:
 
         if ((ret = ff_mpv_common_frame_size_change(s)))
             return ret;
+
+        if (avctx->pix_fmt != h263_get_format(avctx)) {
+            av_log(avctx, AV_LOG_ERROR, "format change not supported\n");
+            avctx->pix_fmt = AV_PIX_FMT_NONE;
+            return AVERROR_UNKNOWN;
+        }
     }
 
     if (s->codec_id == AV_CODEC_ID_H263  ||