diff options
author | Anton Khirnov <anton@khirnov.net> | 2021-12-11 14:25:14 +0100 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2022-07-23 11:53:19 +0200 |
commit | 12e9e50219e60bb5d15bc77f57572274d0ca8a46 (patch) | |
tree | 5d7331f3f1a3af8a04bd611c8517363fb5f4cb98 | |
parent | d8e944c2385fab726beb48011ebe1e48b84fe96c (diff) |
fftools/ffmpeg: set want_sdp when initializing the muxer
Allows making the variable local to ffmpeg_mux.
-rw-r--r-- | fftools/ffmpeg.c | 9 | ||||
-rw-r--r-- | fftools/ffmpeg.h | 1 | ||||
-rw-r--r-- | fftools/ffmpeg_mux.c | 5 |
3 files changed, 6 insertions, 9 deletions
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 42c11e84ad..062f7c3b6a 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -137,8 +137,6 @@ static int64_t nb_frames_drop = 0; static int64_t decode_error_stat[2]; unsigned nb_output_dumped = 0; -int want_sdp = 1; - static BenchmarkTimeStamps current_time; AVIOContext *progress_avio = NULL; @@ -4513,7 +4511,7 @@ static int64_t getmaxrss(void) int main(int argc, char **argv) { - int i, ret; + int ret; BenchmarkTimeStamps ti; init_dynload(); @@ -4549,11 +4547,6 @@ int main(int argc, char **argv) exit_program(1); } - for (i = 0; i < nb_output_files; i++) { - if (strcmp(output_files[i]->format->name, "rtp")) - want_sdp = 0; - } - current_time = ti = get_benchmark_time_stamps(); if (transcode() < 0) exit_program(1); diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 7ab7aa94bf..78f4cb6c29 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -656,7 +656,6 @@ extern char *qsv_device; #endif extern HWDevice *filter_hw_device; -extern int want_sdp; extern unsigned nb_output_dumped; extern int main_return_code; diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index 207231f33b..db04b7858d 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -38,6 +38,8 @@ struct Muxer { int header_written; }; +static int want_sdp = 1; + static void close_all_output_streams(OutputStream *ost, OSTFinished this_stream, OSTFinished others) { int i; @@ -335,6 +337,9 @@ int of_muxer_init(OutputFile *of, int64_t limit_filesize) mux->limit_filesize = limit_filesize; + if (strcmp(of->format->name, "rtp")) + want_sdp = 0; + return 0; } |