Merge commit 'c80a8161'

* commit 'c80a8161':
  h263dec: call get_format() on resolution changes
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/h263dec.c

@@ -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  ||