summaryrefslogtreecommitdiff
path: root/fftools/ffmpeg_mux.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2022-10-13 15:29:29 +0200
committerAnton Khirnov <anton@khirnov.net>2022-10-18 13:57:43 +0200
commitee0a900e5817148c8343f8f95e7b811b069704f4 (patch)
treeb174b3ff208bde792e096f63b71c94a55b4c690e /fftools/ffmpeg_mux.c
parentd6195c88e232ce936fab1ac36fc296bf42497225 (diff)
downloadffmpeg-ee0a900e5817148c8343f8f95e7b811b069704f4.tar.gz
fftools/ffmpeg_mux: move sq_mux from OutputFile to Muxer
It is internal to ffmpeg_mux* and does not need to be visible to other code.
Diffstat (limited to 'fftools/ffmpeg_mux.c')
-rw-r--r--fftools/ffmpeg_mux.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c
index f830e5854b..652628185e 100644
--- a/fftools/ffmpeg_mux.c
+++ b/fftools/ffmpeg_mux.c
@@ -159,12 +159,12 @@ static int sync_queue_process(Muxer *mux, OutputStream *ost, AVPacket *pkt)
OutputFile *of = &mux->of;
if (ost->sq_idx_mux >= 0) {
- int ret = sq_send(of->sq_mux, ost->sq_idx_mux, SQPKT(pkt));
+ int ret = sq_send(mux->sq_mux, ost->sq_idx_mux, SQPKT(pkt));
if (ret < 0)
return ret;
while (1) {
- ret = sq_receive(of->sq_mux, -1, SQPKT(mux->sq_pkt));
+ ret = sq_receive(mux->sq_mux, -1, SQPKT(mux->sq_pkt));
if (ret < 0)
return (ret == AVERROR_EOF || ret == AVERROR(EAGAIN)) ? 0 : ret;
@@ -540,7 +540,7 @@ int of_stream_init(OutputFile *of, OutputStream *ost)
{
Muxer *mux = mux_from_of(of);
if (ost->sq_idx_mux >= 0)
- sq_set_tb(of->sq_mux, ost->sq_idx_mux, ost->mux_timebase);
+ sq_set_tb(mux->sq_mux, ost->sq_idx_mux, ost->mux_timebase);
ost->initialized = 1;
@@ -611,7 +611,7 @@ void of_close(OutputFile **pof)
thread_stop(mux);
sq_free(&of->sq_encode);
- sq_free(&of->sq_mux);
+ sq_free(&mux->sq_mux);
for (int i = 0; i < mux->of.nb_streams; i++) {
MuxStream *ms = &mux->streams[i];