virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-19 09:02:26 +02:00
Code Issues Releases Activity

avcodec/proresdec2: allow changing resolution

Browse Source
This commit is contained in:
Paul B Mahol 2018-12-05 18:50:33 +01:00
parent eade85bbbd
commit 49d792fff6
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/proresdec2.c
View File

@ -221,9 +221,12 @@ static int decode_frame_header(ProresContext *ctx, const uint8_t *buf,
height = AV_RB16(buf + 10); height = AV_RB16(buf + 10);
if (width != avctx->width || height != avctx->height) { 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); 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; ctx->frame_type = (buf[12] >> 2) & 3;