virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

fftools/ffmpeg_mux: make copy_prior_start private to muxing code

Browse Source 
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 8763b9cc36
commit 7f8827f28e
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fftools/ffmpeg.h
View File

@@ -659,7 +659,6 @@ typedef struct OutputStream {
const char *attachment_filename; const char *attachment_filename;
int copy_initial_nonkeyframes; int copy_initial_nonkeyframes;
int copy_prior_start;
int keep_pix_fmt; int keep_pix_fmt;

2
fftools/ffmpeg_mux.c
View File

@@ -398,7 +398,7 @@ void of_streamcopy(OutputStream *ost, const AVPacket *pkt, int64_t dts)
return; return;
if (!ms->streamcopy_started) { if (!ms->streamcopy_started) {
if (!ost->copy_prior_start && if (!ms->copy_prior_start &&
(pkt->pts == AV_NOPTS_VALUE ? (pkt->pts == AV_NOPTS_VALUE ?
dts < ms->ts_copy_start : dts < ms->ts_copy_start :
pkt->pts < av_rescale_q(ms->ts_copy_start, AV_TIME_BASE_Q, pkt->time_base))) pkt->pts < av_rescale_q(ms->ts_copy_start, AV_TIME_BASE_Q, pkt->time_base)))

1
fftools/ffmpeg_mux.h
View File

@@ -75,6 +75,7 @@ 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 copy_prior_start;
int streamcopy_started; int streamcopy_started;
} MuxStream; } MuxStream;

6
fftools/ffmpeg_mux_init.c
View File

@@ -908,7 +908,7 @@ static int streamcopy_init(const Muxer *mux, const OptionsContext *o,
if (ost->st->duration <= 0 && ist->st->duration > 0) if (ost->st->duration <= 0 && ist->st->duration > 0)
ost->st->duration = av_rescale_q(ist->st->duration, ist->st->time_base, ost->st->time_base); ost->st->duration = av_rescale_q(ist->st->duration, ist->st->time_base, ost->st->time_base);
if (!ost->copy_prior_start) { if (!ms->copy_prior_start) {
ms->ts_copy_start = (mux->of.start_time == AV_NOPTS_VALUE) ? ms->ts_copy_start = (mux->of.start_time == AV_NOPTS_VALUE) ?
0 : mux->of.start_time; 0 : mux->of.start_time;
if (copy_ts && ifile->start_time != AV_NOPTS_VALUE) { if (copy_ts && ifile->start_time != AV_NOPTS_VALUE) {
@@ -1156,8 +1156,8 @@ static OutputStream *ost_add(Muxer *mux, const OptionsContext *o,
} }
} }
ost->copy_prior_start = -1; ms->copy_prior_start = -1;
MATCH_PER_STREAM_OPT(copy_prior_start, i, ost->copy_prior_start, oc ,st); MATCH_PER_STREAM_OPT(copy_prior_start, i, ms->copy_prior_start, oc ,st);
MATCH_PER_STREAM_OPT(bitstream_filters, str, bsfs, oc, st); MATCH_PER_STREAM_OPT(bitstream_filters, str, bsfs, oc, st);
if (bsfs && *bsfs) { if (bsfs && *bsfs) {