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

fftools/ffmpeg_mux: make streamcopy_started private to muxing code 

It is no longer used outside of ffmpeg_mux*
This commit is contained in:
Anton Khirnov 2023-04-13 14:45:58 +02:00
parent 83646146fe
commit 8763b9cc36
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fftools/ffmpeg.h
View File

@ -658,7 +658,6 @@ typedef struct OutputStream {
int inputs_done; int inputs_done;
const char *attachment_filename; const char *attachment_filename;
int streamcopy_started;
int copy_initial_nonkeyframes; int copy_initial_nonkeyframes;
int copy_prior_start; int copy_prior_start;

6
fftools/ffmpeg_mux.c
View File

@ -393,11 +393,11 @@ void of_streamcopy(OutputStream *ost, const AVPacket *pkt, int64_t dts)
return; return;
} }
if (!ost->streamcopy_started && !(pkt->flags & AV_PKT_FLAG_KEY) && if (!ms->streamcopy_started && !(pkt->flags & AV_PKT_FLAG_KEY) &&
!ost->copy_initial_nonkeyframes) !ost->copy_initial_nonkeyframes)
return; return;
if (!ost->streamcopy_started) { if (!ms->streamcopy_started) {
if (!ost->copy_prior_start && if (!ost->copy_prior_start &&
(pkt->pts == AV_NOPTS_VALUE ? (pkt->pts == AV_NOPTS_VALUE ?
dts < ms->ts_copy_start : dts < ms->ts_copy_start :
@ -451,7 +451,7 @@ void of_streamcopy(OutputStream *ost, const AVPacket *pkt, int64_t dts)
of_output_packet(of, opkt, ost, 0); of_output_packet(of, opkt, ost, 0);
ost->streamcopy_started = 1; ms->streamcopy_started = 1;
} }
static int thread_stop(Muxer *mux) static int thread_stop(Muxer *mux)

2
fftools/ffmpeg_mux.h
View File

@ -74,6 +74,8 @@ typedef struct MuxStream {
// combined size of all the packets sent to the muxer // combined size of all the packets sent to the muxer
uint64_t data_size_mux; uint64_t data_size_mux;
int streamcopy_started;
} MuxStream; } MuxStream;
typedef struct Muxer { typedef struct Muxer {