diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-12-09 03:23:32 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-12-31 12:00:15 +0100 |
| commit | 8af82be946186921d8391eff3a82815d75b44b99 (patch) | |
| tree | c2107d290f370b164546498a71191e8ce5e3fced /libavcodec/mpeg12dec.c | |
| parent | ebbdb928e88e160fddedf6eb182503bfefadb37d (diff) | |
| download | ffmpeg-8af82be946186921d8391eff3a82815d75b44b99.tar.gz | |
avcodec/mpegvideo: Merge ff_mpv_decode_defaults into ff_mpv_decode_init
These two are always called directly after each other (with the
exception of the calls in mpeg_decode_init() where some irrelevant
modifications of the avctx (which could just as well be done before
ff_mpv_decode_defaults(), because it doesn't have a pointer to the
AVCodecContext at all and therefore can't see these modifications at
all) are performed in between), so merge ff_mpv_decode_defaults() in
ff_mpv_decode_init().
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Diffstat (limited to 'libavcodec/mpeg12dec.c')
| -rw-r--r-- | libavcodec/mpeg12dec.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 7d797c259a..123ede4704 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1050,8 +1050,6 @@ static av_cold int mpeg_decode_init(AVCodecContext *avctx) Mpeg1Context *s = avctx->priv_data; 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 @@ -3099,7 +3097,6 @@ static av_cold int ipu_decode_init(AVCodecContext *avctx) avctx->pix_fmt = AV_PIX_FMT_YUV420P; - ff_mpv_decode_defaults(m); ff_mpv_decode_init(m, avctx); s->m.avctx = avctx; ff_mpv_idct_init(m); |