[FFmpeg-cvslog] avformat/utils: remove AVStreamInternal.orig_codec_id

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Jul 14 16:07:49 2021 -0300| [ef1302db2db67d483fcc37b0bbced61394c3620b] | committer: James Almer

avformat/utils: remove AVStreamInternal.orig_codec_id

It's a write only field.

Reviewed-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ef1302db2db67d483fcc37b0bbced61394c3620b
---

 libavformat/internal.h | 2 --
 libavformat/utils.c    | 8 +-------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/libavformat/internal.h b/libavformat/internal.h
index 240de9e289..4b7ab082e7 100644
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -204,8 +204,6 @@ struct AVStreamInternal {
      */
     int avctx_inited;
 
-    enum AVCodecID orig_codec_id;
-
     /* the context for extracting extradata in find_stream_info()
      * inited=1/bsf=NULL signals that extracting is not possible (codec not
      * supported) */
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 998fddf270..0396e42ce7 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -482,7 +482,7 @@ int avformat_open_input(AVFormatContext **ps, const char *filename,
                         const AVInputFormat *fmt, AVDictionary **options)
 {
     AVFormatContext *s = *ps;
-    int i, ret = 0;
+    int ret = 0;
     AVDictionary *tmp = NULL;
     ID3v2ExtraMeta *id3v2_extra_meta = NULL;
 
@@ -604,9 +604,6 @@ int avformat_open_input(AVFormatContext **ps, const char *filename,
 
     update_stream_avctx(s);
 
-    for (i = 0; i < s->nb_streams; i++)
-        s->streams[i]->internal->orig_codec_id = s->streams[i]->codecpar->codec_id;
-
     if (options) {
         av_dict_free(options);
         *options = tmp;
@@ -3614,9 +3611,6 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
             }
         }
 
-        if (st->codecpar->codec_id != st->internal->orig_codec_id)
-            st->internal->orig_codec_id = st->codecpar->codec_id;
-
         ret = avcodec_parameters_to_context(avctx, st->codecpar);
         if (ret < 0)
             goto find_stream_info_err;