[FFmpeg-devel] [PATCH v2] fftools/ffmpeg_mux: fix reporting muxer EOF as error
Zhao Zhili
quinkblack at foxmail.com
Sat Apr 22 15:56:34 EEST 2023
From: Zhao Zhili <zhilizhao at tencent.com>
Fix #10327.
Signed-off-by: Zhao Zhili <zhilizhao at tencent.com>
---
fftools/ffmpeg_mux.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c
index a2e8873ad2..0e1a5d7dc5 100644
--- a/fftools/ffmpeg_mux.c
+++ b/fftools/ffmpeg_mux.c
@@ -214,9 +214,15 @@ static void *muxer_thread(void *arg)
ost = of->streams[stream_idx];
ret = sync_queue_process(mux, ost, ret < 0 ? NULL : pkt, &stream_eof);
av_packet_unref(pkt);
- if (ret == AVERROR_EOF && stream_eof)
- tq_receive_finish(mux->tq, stream_idx);
- else if (ret < 0) {
+ if (ret == AVERROR_EOF) {
+ if (stream_eof) {
+ tq_receive_finish(mux->tq, stream_idx);
+ } else {
+ av_log(mux, AV_LOG_VERBOSE, "Muxer %s\n", av_err2str(ret));
+ ret = 0;
+ break;
+ }
+ } else if (ret < 0) {
av_log(mux, AV_LOG_ERROR, "Error muxing a packet\n");
break;
}
--
2.34.1
More information about the ffmpeg-devel
mailing list