diff mbox series

[FFmpeg-devel,2/7] avcodec/h263dec, mpeg12dec: Remove redundant writes

Message ID HE1PR0301MB21547F6EF62C08F0387889BA8F749@HE1PR0301MB2154.eurprd03.prod.outlook.com
State Accepted
Commit effc7676e39174171413c332df87f9c973aa0315
Headers show
Series [FFmpeg-devel,1/7] avcodec/rv34: Move dsp init code to rv30/rv40 | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

Andreas Rheinhardt April 8, 2021, 7:40 p.m. UTC 
ff_mpv_decode_init() already sets MpegEncContext.codec_id.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
Supersedes http://ffmpeg.org/pipermail/ffmpeg-devel/2021-April/278741.html

 libavcodec/h263dec.c   | 1 -
 libavcodec/mpeg12dec.c | 1 -
 2 files changed, 2 deletions(-)
diff mbox series

Patch

diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index e8b4d83e6e..192cc487da 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -130,7 +130,6 @@  av_cold int ff_h263_decode_init(AVCodecContext *avctx)
                avctx->codec->id);
         return AVERROR(ENOSYS);
     }
-    s->codec_id    = avctx->codec->id;
 
     if (avctx->codec_tag == AV_RL32("L263") || avctx->codec_tag == AV_RL32("S263"))
         if (avctx->extradata_size == 56 && avctx->extradata[0] == 1)
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index 94221da2c1..2d2b7517ad 100644
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -1067,7 +1067,6 @@  static av_cold int mpeg_decode_init(AVCodecContext *avctx)
     s->mpeg_enc_ctx_allocated      = 0;
     s->mpeg_enc_ctx.picture_number = 0;
     s->repeat_field                = 0;
-    s->mpeg_enc_ctx.codec_id       = avctx->codec->id;
     avctx->color_range             = AVCOL_RANGE_MPEG;
     return 0;
 }