From patchwork Sat Mar 28 18:15:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 18469 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id BAEC04400C2 for ; Sat, 28 Mar 2020 20:15:47 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A00DC68B6AB; Sat, 28 Mar 2020 20:15:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2865B68B4A2 for ; Sat, 28 Mar 2020 20:15:42 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 13AFDE3517; Sat, 28 Mar 2020 19:15:42 +0100 (CET) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hx9p70glfDzc; Sat, 28 Mar 2020 19:15:40 +0100 (CET) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id B4518E33DE; Sat, 28 Mar 2020 19:15:40 +0100 (CET) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Sat, 28 Mar 2020 19:15:13 +0100 Message-Id: <20200328181515.5333-6-cus@passwd.hu> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20200328181515.5333-1-cus@passwd.hu> References: <20200328181515.5333-1-cus@passwd.hu> Subject: [FFmpeg-devel] [PATCH 6/8] avformat/mux: do not destroy packets of av_write_frame on bitstream filtering X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Marton Balint MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" av_write_frame() does not take ownership of the packet. Signed-off-by: Marton Balint --- libavformat/mux.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libavformat/mux.c b/libavformat/mux.c index 3054ab8644..706fdcbbf4 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -935,7 +935,16 @@ static int write_packets_common(AVFormatContext *s, AVStream *st, AVPacket *pkt, if (ret < 0) { if (ret == AVERROR(EAGAIN) && !consumed_packet) { av_assert2(sti->bsfcs_idx == 0); - ret = av_bsf_send_packet(sti->bsfcs[0], pkt); + if (!interleaved && pkt) { + AVPacket tmp; + ret = av_packet_ref(&tmp, pkt); + if (ret < 0) + goto fail; + ret = av_bsf_send_packet(sti->bsfcs[0], &tmp); + av_packet_unref(&tmp); + } else { + ret = av_bsf_send_packet(sti->bsfcs[0], pkt); + } av_assert2(ret != AVERROR(EAGAIN)); if (ret >= 0) { consumed_packet = 1;