virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avformat/utils: remove AVStreamInternal.orig_codec_id

Browse Source 
It's a write only field.

Reviewed-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2021-07-14 16:07:49 -03:00
parent 305be41374
commit ef1302db2d
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/internal.h
View File

@@ -204,8 +204,6 @@ struct AVStreamInternal {
*/ */
int avctx_inited; int avctx_inited;
enum AVCodecID orig_codec_id;
/* the context for extracting extradata in find_stream_info() /* the context for extracting extradata in find_stream_info()
* inited=1/bsf=NULL signals that extracting is not possible (codec not * inited=1/bsf=NULL signals that extracting is not possible (codec not
* supported) */ * supported) */

8
libavformat/utils.c
View File

@@ -482,7 +482,7 @@ int avformat_open_input(AVFormatContext **ps, const char *filename,
const AVInputFormat *fmt, AVDictionary **options) const AVInputFormat *fmt, AVDictionary **options)
{ {
AVFormatContext *s = *ps; AVFormatContext *s = *ps;
int i, ret = 0; int ret = 0;
AVDictionary *tmp = NULL; AVDictionary *tmp = NULL;
ID3v2ExtraMeta *id3v2_extra_meta = NULL; ID3v2ExtraMeta *id3v2_extra_meta = NULL;
@@ -604,9 +604,6 @@ int avformat_open_input(AVFormatContext **ps, const char *filename,
update_stream_avctx(s); 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) { if (options) {
av_dict_free(options); av_dict_free(options);
*options = tmp; *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); ret = avcodec_parameters_to_context(avctx, st->codecpar);
if (ret < 0) if (ret < 0)
goto find_stream_info_err; goto find_stream_info_err;