[FFmpeg-cvslog] avcodec/proresdec2: allow changing resolution

[Paul B Mahol]

ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Wed Dec  5 18:50:33 2018 +0100| [49d792fff62ebe7a041b5a0294bed4bcac65a9ca] | committer: Paul B Mahol

avcodec/proresdec2: allow changing resolution

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=49d792fff62ebe7a041b5a0294bed4bcac65a9ca
---

 libavcodec/proresdec2.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libavcodec/proresdec2.c b/libavcodec/proresdec2.c
index 6b246319ef..6209c229c9 100644
--- a/libavcodec/proresdec2.c
+++ b/libavcodec/proresdec2.c
@@ -221,9 +221,12 @@ static int decode_frame_header(ProresContext *ctx, const uint8_t *buf,
     height = AV_RB16(buf + 10);
 
     if (width != avctx->width || height != avctx->height) {
-        av_log(avctx, AV_LOG_ERROR, "picture resolution change: %dx%d -> %dx%d\n",
+        int ret;
+
+        av_log(avctx, AV_LOG_WARNING, "picture resolution change: %dx%d -> %dx%d\n",
                avctx->width, avctx->height, width, height);
-        return AVERROR_PATCHWELCOME;
+        if ((ret = ff_set_dimensions(avctx, width, height)) < 0)
+            return ret;
     }
 
     ctx->frame_type = (buf[12] >> 2) & 3;