Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
* [FFmpeg-devel] [PATCH v2] fftools/ffmpeg_mux: fix reporting muxer EOF as error
@ 2023-04-22 12:56 Zhao Zhili
  2023-04-22 15:44 ` Anton Khirnov
  0 siblings, 1 reply; 22+ messages in thread
From: Zhao Zhili @ 2023-04-22 12:56 UTC (permalink / raw)
  To: ffmpeg-devel; +Cc: Zhao Zhili

From: Zhao Zhili <zhilizhao@tencent.com>

Fix #10327.

Signed-off-by: Zhao Zhili <zhilizhao@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

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

^ permalink raw reply	[flat|nested] 22+ messages in thread

end of thread, other threads:[~2023-04-25 14:37 UTC | newest]

Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-22 12:56 [FFmpeg-devel] [PATCH v2] fftools/ffmpeg_mux: fix reporting muxer EOF as error Zhao Zhili
2023-04-22 15:44 ` Anton Khirnov
2023-04-23  9:12   ` Marton Balint
2023-04-23  9:34     ` Anton Khirnov
2023-04-23  9:42       ` Marton Balint
2023-04-23  9:48         ` "zhilizhao(赵志立)"
2023-04-23  9:51         ` Anton Khirnov
2023-04-23 10:05           ` Marton Balint
2023-04-23 10:07             ` Nicolas George
2023-04-23 12:01             ` Anton Khirnov
2023-04-23 18:15               ` Marton Balint
2023-04-23 20:16                 ` Anton Khirnov
2023-04-24  9:09                   ` Marton Balint
2023-04-24  9:19                     ` Nicolas George
2023-04-24 10:02                     ` Anton Khirnov
2023-04-24 18:41                       ` Marton Balint
2023-04-24 19:24                         ` Anton Khirnov
2023-04-24 19:42                           ` Marton Balint
2023-04-24 21:08                             ` Anton Khirnov
2023-04-25 14:37                               ` Nicolas George
2023-04-24 20:41                         ` Nicolas George
2023-04-24 10:08                     ` Anton Khirnov

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git