RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fftools/ffmpeg_demux: move InputStream.streamcopy_needed to private data 

It is no longer used outside of ffmpeg_demux.
This commit is contained in:
Anton Khirnov 2023-05-07 16:19:38 +02:00
parent 7df3253c5a
commit 6b0c984f0d
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fftools/ffmpeg.h
View File

@ -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

8
fftools/ffmpeg_demux.c
View File

@ -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);