Merge commit 'c80a816142699dea9cf9fa66689a7838a487ed7e'

* commit 'c80a816142699dea9cf9fa66689a7838a487ed7e': h263dec: call get_format() on resolution changes Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · b9918a7688
parent 40f2b16d52 c80a816142
commit b9918a7688
1 changed files with 6 additions and 0 deletions
--- a/libavcodec/h263dec.c
+++ b/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  ||