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 8288B4204C for ; Fri, 25 Mar 2022 22:55:23 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9133D68B21A; Sat, 26 Mar 2022 00:55:09 +0200 (EET) Received: from srv-infra-1.infra.inf.glb.tvvideoms.com (www.inf.tvvideoms.com [213.205.126.156]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7808268008C for ; Sat, 26 Mar 2022 00:55:02 +0200 (EET) Received: from cji.paris (unknown [172.16.3.159]) by srv-infra-1.infra.inf.glb.tvvideoms.com (Postfix) with ESMTP id 209AF21568; Fri, 25 Mar 2022 22:55:00 +0000 (UTC) From: Nicolas Gaullier To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Mar 2022 23:54:52 +0100 Message-Id: <20220325225452.47-3-nicolas.gaullier@cji.paris> X-Mailer: git-send-email 2.34.0.windows.1 In-Reply-To: <20220325225452.47-1-nicolas.gaullier@cji.paris> References: <20220325225452.47-1-nicolas.gaullier@cji.paris> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 2/2] lavf/mpegenc: fix termination on error conditions 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: Nicolas Gaullier 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: Avoid an infinite 'retry' loop in output_packet when flushing. Signed-off-by: Nicolas Gaullier --- libavformat/mpegenc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c index e0955a7d33..e113a42867 100644 --- a/libavformat/mpegenc.c +++ b/libavformat/mpegenc.c @@ -1002,7 +1002,7 @@ static int output_packet(AVFormatContext *ctx, int flush) MpegMuxContext *s = ctx->priv_data; AVStream *st; StreamInfo *stream; - int i, avail_space = 0, es_size, trailer_size; + int i, has_avail_data = 0, avail_space = 0, es_size, trailer_size; int best_i = -1; int best_score = INT_MIN; int ignore_constraints = 0; @@ -1028,6 +1028,7 @@ retry: if (avail_data == 0) continue; av_assert0(avail_data > 0); + has_avail_data = 1; if (space < s->packet_size && !ignore_constraints) continue; @@ -1048,6 +1049,8 @@ retry: int64_t best_dts = INT64_MAX; int has_premux = 0; + if (!has_avail_data) + return 0; for (i = 0; i < ctx->nb_streams; i++) { AVStream *st = ctx->streams[i]; StreamInfo *stream = st->priv_data; -- 2.34.0.windows.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".