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.
---
fftools/ffmpeg_mux.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c
index 026796f7e6..2fb2c7ccaa 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);
--
2.40.1
_______________________________________________
ffmpeg-devel mailing list
[email protected]
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
[email protected] with subject "unsubscribe".
