RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/mpeg12dec: Set out_format only once 

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2024-04-22 02:11:15 +02:00
parent bbe10bcae8
commit 5ea7c0e323
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/mpeg12dec.c
View File

@ -794,6 +794,8 @@ static av_cold int mpeg_decode_init(AVCodecContext *avctx)
Mpeg1Context *s = avctx->priv_data; Mpeg1Context *s = avctx->priv_data;
MpegEncContext *s2 = &s->mpeg_enc_ctx; MpegEncContext *s2 = &s->mpeg_enc_ctx;
s2->out_format = FMT_MPEG1;
if ( avctx->codec_tag != AV_RL32("VCR2") if ( avctx->codec_tag != AV_RL32("VCR2")
&& avctx->codec_tag != AV_RL32("BW10")) && avctx->codec_tag != AV_RL32("BW10"))
avctx->coded_width = avctx->coded_height = 0; // do not trust dimensions from input avctx->coded_width = avctx->coded_height = 0; // do not trust dimensions from input
@ -1859,7 +1861,6 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx,
s->chroma_format = 1; s->chroma_format = 1;
s->codec_id = s->codec_id =
s->avctx->codec_id = AV_CODEC_ID_MPEG1VIDEO; s->avctx->codec_id = AV_CODEC_ID_MPEG1VIDEO;
s->out_format = FMT_MPEG1;
if (s->avctx->flags & AV_CODEC_FLAG_LOW_DELAY) if (s->avctx->flags & AV_CODEC_FLAG_LOW_DELAY)
s->low_delay = 1; s->low_delay = 1;
@ -1877,7 +1878,6 @@ static int vcr2_init_sequence(AVCodecContext *avctx)
int i, v, ret; int i, v, ret;
/* start new MPEG-1 context decoding */ /* start new MPEG-1 context decoding */
s->out_format = FMT_MPEG1;
if (s->context_initialized) if (s->context_initialized)
ff_mpv_common_end(s); ff_mpv_common_end(s);