From patchwork Fri Nov 4 12:43:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 1291 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp1296711vsb; Fri, 4 Nov 2016 05:44:07 -0700 (PDT) X-Received: by 10.194.155.35 with SMTP id vt3mr11509304wjb.223.1478263447674; Fri, 04 Nov 2016 05:44:07 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id kq9si14933587wjb.151.2016.11.04.05.44.07; Fri, 04 Nov 2016 05:44:07 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CEB3B689D34; Fri, 4 Nov 2016 14:43:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-3.mx.upcmail.net (vie01a-dmta-pe01-3.mx.upcmail.net [62.179.121.156]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B6E126898C4 for ; Fri, 4 Nov 2016 14:43:46 +0200 (EET) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1c2dqX-0007RQ-UD for ffmpeg-devel@ffmpeg.org; Fri, 04 Nov 2016 13:43:49 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id 3ojo1u02H0S5wYM01ojppw; Fri, 04 Nov 2016 13:43:49 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 4 Nov 2016 13:43:44 +0100 Message-Id: <20161104124345.5031-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161104124345.5031-1-michael@niedermayer.cc> References: <20161104124345.5031-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 1/2] ffmpeg: Always run av_packet_split_side_data() before writing a packet 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The new automatically inserted bitstream filters are not compatible with merged side data. This works around this by spliting the side data out. Signed-off-by: Michael Niedermayer --- ffmpeg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ffmpeg.c b/ffmpeg.c index 28daf5f..6c02091 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -787,11 +787,11 @@ static void output_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost) { int ret = 0; + av_packet_split_side_data(pkt); /* apply the output bitstream filters, if any */ if (ost->nb_bitstream_filters) { int idx; - av_packet_split_side_data(pkt); ret = av_bsf_send_packet(ost->bsf_ctx[0], pkt); if (ret < 0) goto finish;