diff options
| author | Anton Khirnov <anton@khirnov.net> | 2021-12-12 12:16:42 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2022-07-23 11:53:19 +0200 |
| commit | 9c2b800203a5a8f3d83f3b8f28e8c50d28186b39 (patch) | |
| tree | f1dd977e229f7882c74a485eac96d2b52f043167 /fftools/ffmpeg_opt.c | |
| parent | 35bfcff07f3b5efc8f322d899de136040c2772a7 (diff) | |
| download | ffmpeg-9c2b800203a5a8f3d83f3b8f28e8c50d28186b39.tar.gz | |
fftools/ffmpeg: move the mux queue into muxer private data
The muxing queue currently lives in OutputStream, which is a very large
struct storing the state for both encoding and muxing. The muxing queue
is only used by the code in ffmpeg_mux, so it makes sense to restrict it
to that file.
This makes the first step towards reducing the scope of OutputStream.
Diffstat (limited to 'fftools/ffmpeg_opt.c')
| -rw-r--r-- | fftools/ffmpeg_opt.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 3698d18bc4..80cff9feca 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -1699,8 +1699,6 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e ost->max_muxing_queue_size = 128; MATCH_PER_STREAM_OPT(max_muxing_queue_size, i, ost->max_muxing_queue_size, oc, st); - ost->muxing_queue_data_size = 0; - ost->muxing_queue_data_threshold = 50*1024*1024; MATCH_PER_STREAM_OPT(muxing_queue_data_threshold, i, ost->muxing_queue_data_threshold, oc, st); @@ -1724,13 +1722,6 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e } ost->last_mux_dts = AV_NOPTS_VALUE; - ost->muxing_queue = av_fifo_alloc2(8, sizeof(AVPacket*), 0); - if (!ost->muxing_queue) - exit_program(1); - - MATCH_PER_STREAM_OPT(copy_initial_nonkeyframes, i, - ost->copy_initial_nonkeyframes, oc, st); - return ost; } |