From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 7AEDF45704 for ; Fri, 21 Apr 2023 08:58:32 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E1CE268BF49; Fri, 21 Apr 2023 11:58:28 +0300 (EEST) Received: from out162-62-57-49.mail.qq.com (out162-62-57-49.mail.qq.com [162.62.57.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 91A2F68BC19 for ; Fri, 21 Apr 2023 11:58:21 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1682067492; bh=fILvbz45Tosd/Pj8/ifLJ+xolZIyv4dsv8544JlrH4I=; h=From:To:Cc:Subject:Date; b=UrgegCKndbpXxch4/jvarGoncyBC5MSM/ET0q94ScrrMsOju540KQFfMl+IuiFD/g ESnztEoLXs1jEKOiLPJHNycdyiXunwK1rDQ1X22SPIOSqPBHcewxujd3KonWPVUYnO HTiWg9jCLqKsTzc/ciJUE+vJg37LU56+9whPnZzg= Received: from localhost.localdomain ([113.108.77.73]) by newxmesmtplogicsvrszc2-0.qq.com (NewEsmtp) with SMTP id E8B23AC7; Fri, 21 Apr 2023 16:58:11 +0800 X-QQ-mid: xmsmtpt1682067491tyq3k44pb Message-ID: X-QQ-XMAILINFO: MziGzrjZeogZoqN0QkxWTMtM5PjIZF7Qv+vbICuQRYAMibpEhhOC9ZakC5/EeM k0WNUrMDMTqOvS/bousGlTCnZJYw5vF8ODEc4DTB6Rf/kCYnQBFxH+7oXGIcSDWNwfdG6F1yELzO oLDxnxUbmuZ2Xs4LYnk4XvlwMLIo9Z0eMl5rUB44aECo2e/xjh3LttAX9rzq5Leh5QwuT5Akb4ZX oH+P4tuKitK9/IgKUAsQMeWvXHg5GyX9PBYZb+ISofzW4Oi4BFLtDqlE0pn7X4ZyijNJLyhk9Tix 2qFwVEvP1KOq9Z2NBheA0hQX5r2LEcxMcos5c+EsuvIGY4bYgbB7W92gQRwo1QK1qAbJ4zP1z/tx QMxsvH31zHPFEnFgGarSPwkNZ5YC/Cs1rE1+wX0egxPZSyUa3H/+wmVNubuOitwoiLzDwuQIz/cg NfHmX1689j2PPiILqCnN7xUKlsx1qqS6yZkkAUR+IfY9gs+j5tvpye55cKUU1ISuutl4WrTm8Duo wXylyh+rPmAFMUrFJZbZEoFn7gdC42/p/2Nil6u+7STiwIpF6AJ02Y2Z997wTiave9Mgc+49B8CE P4Hfg/C2oObG1ERkWUkgKEY+UPf5A5fepSsDqgqg4wsFtQZRSY5e34RpifUQB8q9TM1Tw8VWJG09 2uSOsFdwuqQcZOCJ/uV5eFOpKozLu/Xjxw4G1bMt9AGlpxnLiKbsVxrOkPaYfy3HemUgM9Kuo8Q5 h/DqZX/3wDxT/G+VK15uMkrxdkczXSkcT2jraFremg6DINud8zp6gvC9OzvK3WrVRLdgNiOCL1EH OMnKY9GqIiKbbY9nSxCg6PoOcDfP+k9WymSBJVsx2vMH8a1ENAlvmAeV2A5dAh6Zi2CpMeRPpTBB ioto6UJqBa+Bb3Ut5UlxPQcFLNXPgRZwBnBJ71dPNs2UMoKjqFSip5ydip/oo2HBPX4HoiGm5ekK oWOgzhMf6hxFMUkxWU9Y3PWE/T91ra From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Apr 2023 00:58:09 +0800 X-OQ-MSGID: <20230421165809.295315-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] fftools/ffmpeg_mux: fix regression with muxer EOF X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Zhao Zhili Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Zhao Zhili Regression introduced by b40856. Fix #10327. --- fftools/ffmpeg_mux.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index a2e8873ad2..b4b4dab8fd 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -214,9 +214,14 @@ 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 { + ret = 0; + break; + } + } else if (ret < 0) { av_log(mux, AV_LOG_ERROR, "Error muxing a packet\n"); break; } -- 2.25.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".