[FFmpeg-cvslog] fftools/ffmpeg_mux: fix terminating muxer on streamcopy with -t
Anton Khirnov
git at videolan.org
Mon Feb 5 13:08:16 EET 2024
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sat Feb 3 20:59:07 2024 +0100| [931192226b757103883cdd5c8a256c09b2372e09] | committer: Anton Khirnov
fftools/ffmpeg_mux: fix terminating muxer on streamcopy with -t
Reported-by: Andreas Rheinhardt
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=931192226b757103883cdd5c8a256c09b2372e09
---
fftools/ffmpeg_mux.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c
index ee708267c1..e65fe89992 100644
--- a/fftools/ffmpeg_mux.c
+++ b/fftools/ffmpeg_mux.c
@@ -300,6 +300,7 @@ static int mux_packet_filter(Muxer *mux, MuxThreadContext *mt,
av_packet_unref(pkt);
pkt = NULL;
ret = 0;
+ *stream_eof = 1;
} else if (ret < 0)
goto fail;
}
@@ -352,14 +353,13 @@ static int mux_packet_filter(Muxer *mux, MuxThreadContext *mt,
goto mux_fail;
}
*stream_eof = 1;
- return AVERROR_EOF;
} else {
ret = sync_queue_process(mux, ms, pkt, stream_eof);
if (ret < 0)
goto mux_fail;
}
- return 0;
+ return *stream_eof ? AVERROR_EOF : 0;
mux_fail:
err_msg = "submitting a packet to the muxer";
More information about the ffmpeg-cvslog
mailing list