diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2014-11-28 16:44:16 +0300 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2017-08-04 20:16:46 +0300 |
commit | 9ce7cba2e6d4aaa6286b9f8e1015d2eab6c28d91 (patch) | |
tree | 2c81fd7c8b3297042719a1489eb8c82079466764 | |
parent | a4a66a03db0a84e646cf202e0847d1d2df0ed016 (diff) |
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.
-rw-r--r-- | libavcodec/mpeg12dec.c | 4 |
1 files changed, 0 insertions, 4 deletions
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; |