diff options
author | Anton Khirnov <anton@khirnov.net> | 2023-07-10 10:48:38 +0200 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2023-07-13 13:08:56 +0200 |
commit | 9a2335444b83b9bfa6553c43c9cbdd352f0f11ef (patch) | |
tree | 33b0280d0240b83f97b254444c58b1305f95985b /fftools/ffmpeg_mux.c | |
parent | 7430ee2b8b1ed8fd675787eb8c4abd44ed89601c (diff) | |
download | ffmpeg-9a2335444b83b9bfa6553c43c9cbdd352f0f11ef.tar.gz |
fftools/ffmpeg_mux: forward EOF from the sync queue
EOF from sq_receive() means no packets will ever be output by the sync
queue. Since the muxing sync queue is always used by all interleaved
(i.e. non-attachment) streams, this means no further packets can make
it to the muxer and we can terminate muxing now.
Diffstat (limited to 'fftools/ffmpeg_mux.c')
-rw-r--r-- | fftools/ffmpeg_mux.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index 026796f7e6..ca32967cd8 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -166,8 +166,14 @@ static int sync_queue_process(Muxer *mux, OutputStream *ost, AVPacket *pkt, int while (1) { ret = sq_receive(mux->sq_mux, -1, SQPKT(mux->sq_pkt)); - if (ret < 0) - return (ret == AVERROR_EOF || ret == AVERROR(EAGAIN)) ? 0 : ret; + if (ret < 0) { + /* n.b.: We forward EOF from the sync queue, terminating muxing. + * This assumes that if a muxing sync queue is present, then all + * the streams use it. That is true currently, but may change in + * the future, then this code needs to be revisited. + */ + return ret == AVERROR(EAGAIN) ? 0 : ret; + } ret = write_packet(mux, of->streams[ret], mux->sq_pkt); |