fftools/ffmpeg_mux: make streamcopy_started private to muxing code

It is no longer used outside of ffmpeg_mux*
pull/389/head
Anton Khirnov 2 years ago
parent 83646146fe
commit 8763b9cc36
  1. 1
      fftools/ffmpeg.h
  2. 6
      fftools/ffmpeg_mux.c
  3. 2
      fftools/ffmpeg_mux.h

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

@ -393,11 +393,11 @@ void of_streamcopy(OutputStream *ost, const AVPacket *pkt, int64_t dts)
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)
return;
if (!ost->streamcopy_started) {
if (!ms->streamcopy_started) {
if (!ost->copy_prior_start &&
(pkt->pts == AV_NOPTS_VALUE ?
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);
ost->streamcopy_started = 1;
ms->streamcopy_started = 1;
}
static int thread_stop(Muxer *mux)

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

Loading…
Cancel
Save