aboutsummaryrefslogtreecommitdiffstats
path: root/fftools/ffmpeg_demux.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2023-12-13 18:39:02 +0100
committerAnton Khirnov <anton@khirnov.net>2023-12-14 20:16:53 +0100
commit0fcea80b2a328f6fd8fc7403e46b18a6e37d6c86 (patch)
treef944d1aca6bffbd84d3f46b13ac9963d4c96c45f /fftools/ffmpeg_demux.c
parent84201d8af6255ddfbeffa38afd51f0ecf742390b (diff)
downloadffmpeg-0fcea80b2a328f6fd8fc7403e46b18a6e37d6c86.tar.gz
fftools/ffmpeg: replace InputStream.file_index by a pointer
Reduces the need to use the input_files global array.
Diffstat (limited to 'fftools/ffmpeg_demux.c')
-rw-r--r--fftools/ffmpeg_demux.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c
index d2466e885d..7625c09674 100644
--- a/fftools/ffmpeg_demux.c
+++ b/fftools/ffmpeg_demux.c
@@ -460,8 +460,7 @@ static int input_packet_process(Demuxer *d, AVPacket *pkt, unsigned *send_flags)
av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &pkt->time_base),
av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &pkt->time_base),
av_ts2str(pkt->duration), av_ts2timestr(pkt->duration, &pkt->time_base),
- av_ts2str(input_files[ist->file_index]->ts_offset),
- av_ts2timestr(input_files[ist->file_index]->ts_offset, &AV_TIME_BASE_Q));
+ av_ts2str(f->ts_offset), av_ts2timestr(f->ts_offset, &AV_TIME_BASE_Q));
}
pkt->stream_index = ds->sch_idx_stream;
@@ -758,7 +757,7 @@ void ifile_close(InputFile **pf)
static int ist_use(InputStream *ist, int decoding_needed)
{
- Demuxer *d = demuxer_from_ifile(input_files[ist->file_index]);
+ Demuxer *d = demuxer_from_ifile(ist->file);
DemuxStream *ds = ds_from_ist(ist);
int ret;
@@ -827,7 +826,7 @@ int ist_output_add(InputStream *ist, OutputStream *ost)
int ist_filter_add(InputStream *ist, InputFilter *ifilter, int is_simple)
{
- Demuxer *d = demuxer_from_ifile(input_files[ist->file_index]);
+ Demuxer *d = demuxer_from_ifile(ist->file);
DemuxStream *ds = ds_from_ist(ist);
int ret;
@@ -991,7 +990,7 @@ static DemuxStream *demux_stream_alloc(Demuxer *d, AVStream *st)
ds->sch_idx_dec = -1;
ds->ist.st = st;
- ds->ist.file_index = f->index;
+ ds->ist.file = f;
ds->ist.index = st->index;
ds->ist.class = &input_stream_class;