diff options
| author | Anton Khirnov <anton@khirnov.net> | 2023-05-07 16:19:38 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2023-05-15 13:32:01 +0200 |
| commit | 6b0c984f0dfe632ec0d59fb12c8880240c5208c0 (patch) | |
| tree | a2d394a4282293fd88df4365f71d8b48a5962258 | |
| parent | 7df3253c5a769239de16a878828ba94b15a15f8b (diff) | |
| download | ffmpeg-6b0c984f0dfe632ec0d59fb12c8880240c5208c0.tar.gz | |
fftools/ffmpeg_demux: move InputStream.streamcopy_needed to private data
It is no longer used outside of ffmpeg_demux.
| -rw-r--r-- | fftools/ffmpeg.h | 1 | ||||
| -rw-r--r-- | fftools/ffmpeg_demux.c | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 559381531e..7eb6301c74 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -343,7 +343,6 @@ typedef struct InputStream { int discard; /* true if stream data should be discarded */ int user_set_discard; int decoding_needed; /* non zero if the packets must be decoded in 'raw_fifo', see DECODING_FOR_* */ - int streamcopy_needed; #define DECODING_FOR_OST 1 #define DECODING_FOR_FILTER 2 // should attach FrameData as opaque_ref after decoding diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 4a04b3e574..ccf1a70d5e 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -60,6 +60,8 @@ typedef struct DemuxStream { double ts_scale; + int streamcopy_needed; + int wrap_correction_done; int saw_first_ts; ///< dts of the first packet read for this stream (in AV_TIME_BASE units) @@ -346,7 +348,7 @@ static int ist_dts_update(DemuxStream *ds, AVPacket *pkt) } av_assert0(!pkt->opaque_ref); - if (ist->streamcopy_needed) { + if (ds->streamcopy_needed) { DemuxPktData *pd; pkt->opaque_ref = av_buffer_allocz(sizeof(*pd)); @@ -806,10 +808,12 @@ void ifile_close(InputFile **pf) static void ist_use(InputStream *ist, int decoding_needed) { + DemuxStream *ds = ds_from_ist(ist); + ist->discard = 0; ist->st->discard = ist->user_set_discard; ist->decoding_needed |= decoding_needed; - ist->streamcopy_needed |= !decoding_needed; + ds->streamcopy_needed |= !decoding_needed; if (decoding_needed && !avcodec_is_open(ist->dec_ctx)) { int ret = dec_open(ist); |