From 9ce7cba2e6d4aaa6286b9f8e1015d2eab6c28d91 Mon Sep 17 00:00:00 2001 From: Hendrik Leppkes Date: Fri, 28 Nov 2014 14:44:16 +0100 Subject: Revert "avcodec/mpeg12dec: do not trust AVCodecContext input dimensions" This reverts commit 77f1199e8fd9a289ad64eb2bb5bd4deeda8bccb8. This change had no positive effect on LAV, and only caused troubles with DXVA2 decoding. --- libavcodec/mpeg12dec.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'libavcodec/mpeg12dec.c') diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 2fd545af4d..8651580957 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1068,10 +1068,6 @@ static av_cold int mpeg_decode_init(AVCodecContext *avctx) MpegEncContext *s2 = &s->mpeg_enc_ctx; ff_mpv_decode_defaults(s2); - - if ( avctx->codec_tag != AV_RL32("VCR2") - && avctx->codec_tag != AV_RL32("BW10")) - avctx->coded_width = avctx->coded_height = 0; // do not trust dimensions from input ff_mpv_decode_init(s2, avctx); s->mpeg_enc_ctx.avctx = avctx; -- cgit v1.2.3