diff options
| author | Paul B Mahol <onemda@gmail.com> | 2018-12-05 18:50:33 +0100 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2018-12-10 17:25:49 +0100 |
| commit | 49d792fff62ebe7a041b5a0294bed4bcac65a9ca (patch) | |
| tree | f6038e4f1f3ec046d0e39e420986898e57c83ee4 /libavcodec/proresdec2.c | |
| parent | eade85bbbd935f4ab5e6315a45650c2bf01465c6 (diff) | |
| download | ffmpeg-49d792fff62ebe7a041b5a0294bed4bcac65a9ca.tar.gz | |
avcodec/proresdec2: allow changing resolution
Diffstat (limited to 'libavcodec/proresdec2.c')
| -rw-r--r-- | libavcodec/proresdec2.c | 7 |
1 files 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; |