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 8A3AD44D52 for ; Sat, 22 Apr 2023 12:57:05 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D4B4368BF49; Sat, 22 Apr 2023 15:57:00 +0300 (EEST) Received: from out203-205-221-210.mail.qq.com (out203-205-221-210.mail.qq.com [203.205.221.210]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 48B0168BE8D for ; Sat, 22 Apr 2023 15:56:52 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1682168201; bh=+79atX/R8+2uRem6Bz0o8mKEQSRifNI528uHu6Cqsgg=; h=From:To:Cc:Subject:Date; b=eT78hvxmeT8zQo4I8cXc5CAcQLSUYIK45WFaKm52twIkYO4T+xBkDUFBJ6klj8SR6 LdzwsDXGaL5Nff/M9cvau5wFs2icQvU9cFOANZdvnnWLW1f3SgRVqAO1dfbAzdMHeM oKDXX9Li6v0VQ/Gg7kH1+qbilmA1kYSVJtnBReDg= Received: from ZHILIZHAO-PC4.localdomain ([113.118.105.237]) by newxmesmtplogicsvrszc2-1.qq.com (NewEsmtp) with SMTP id E281DA2A; Sat, 22 Apr 2023 20:56:40 +0800 X-QQ-mid: xmsmtpt1682168200tirdph980 Message-ID: X-QQ-XMAILINFO: NafziRg7Bx69vC3z6TVfsFUs40Uw1UcnCit95IVtGnsieSjj9nug2WUCbWUeol RGzhMmfR+yeTbO6EOenY4A/vXcNGbrpJjAfZuEXKGd4R0g3lt8L8WaLtjABT7bNf77tL5k8Xf8NO YmfmVQcQT4/Go4hPKtSe4J/n8SBH77nRcN+LxOH4TjpvocaSe1u0D+GrijLu/IcppzPBOjTv4I9o EPPkBxMKELUHoCurqreOzigM4rfBrdqVXL6W7P7q+CMFAfBb2S9LruuIlQUqgCuNCCeEW54WqW7z Xzuax8a+uQ5BKAP93Yd1TxM932SpgMD/4lsYbWwCdvXgo26ju5NFc8FYyeDqjdWXBXAdnn3l26IM dExBBJadLc3aIBUUR+6hlqQxQ+NKb39YH1MHKLnMjCiqDuqIIzyqStb4QTE7QE1B8Zyd/aP5lGkB i5yY0O+do1GJLvZZgRRS7tL1rW5/22hkQnpB9fAVkTqSVeRT4XzuZVn+pfjoH+Pl841G641LDxFX Osm9GYBeqPbh0QeY+5xOGN0RUXRcQ7U78AVnhZbXUBF5HrZzL7eFGQZMeroqZRLOyS+sbF1tN+OK FSCS46YjXq43EOfPkxoxtI+85CUivLE84B55UydXiR9sYjhuzVNF7QIX+N4/NuYU6a9qzMERitnx llAA+0IsoFTHEJydHJ2/fS5Hg5ItsEvyELwZYEMzuBXkAHrWzAA8cMsAX9bvbRSxBvgnNTRiUWHH GwHreIMLgWeUQNLgmQmxvaL/NvXEwBEGO+tWhoZaUKUtXeVovYrJYWWHa4RmRnApcol/zPl29hZ4 V1B4W0WMmo4WolCRVc2UM8uWsy39LqtSL9E/ih+iVGr67WvLTsYtdeklglD6ZUdMfOD7tr8/RRU9 X5cITzcw1fjP8j1GG0mUQFWsBPR50mMqeVJevZnLTY4kz2WAzRL0JkjAerAJCdWDVoCCTtYKXUeb usguSluBPvV4JOQmVrcKxTL6pkk1Ik From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Apr 2023 20:56:34 +0800 X-OQ-MSGID: <20230422125634.16442-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] fftools/ffmpeg_mux: fix reporting muxer EOF as error 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 Fix #10327. Signed-off-by: Zhao Zhili --- 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".