From 9de9b828ef005dec37052548c195a6b4f18fc701 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Fri, 22 Mar 2013 07:59:10 +0100 Subject: [PATCH] lavc: don't overwrite display dimensions with coded dimensions. --- libavcodec/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 46486a2ff7..dfb2f541e7 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -905,7 +905,7 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code if ((ret = av_opt_set_dict(avctx, &tmp)) < 0) goto free_and_end; - if (avctx->coded_width && avctx->coded_height) + if (avctx->coded_width && avctx->coded_height && !avctx->width && !avctx->height) avcodec_set_dimensions(avctx, avctx->coded_width, avctx->coded_height); else if (avctx->width && avctx->height) avcodec_set_dimensions(avctx, avctx->width, avctx->height);