From patchwork Fri Nov 4 12:43:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 1290 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp1296796vsb; Fri, 4 Nov 2016 05:44:16 -0700 (PDT) X-Received: by 10.28.146.130 with SMTP id u124mr3067834wmd.69.1478263456855; Fri, 04 Nov 2016 05:44:16 -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 rx17si14913556wjb.210.2016.11.04.05.44.15; Fri, 04 Nov 2016 05:44:16 -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 3A35F689D40; Fri, 4 Nov 2016 14:43:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-1.mx.upcmail.net (vie01a-dmta-pe03-1.mx.upcmail.net [62.179.121.160]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0170668988C for ; Fri, 4 Nov 2016 14:43:48 +0200 (EET) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1c2dqZ-00007B-1G for ffmpeg-devel@ffmpeg.org; Fri, 04 Nov 2016 13:43:51 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id 3ojp1u01q0S5wYM01ojqqG; Fri, 04 Nov 2016 13:43:51 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 4 Nov 2016 13:43:45 +0100 Message-Id: <20161104124345.5031-3-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 2/2] avformat/mux: split side data before internal auto BSF 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 bitstream filters do not work with merged in side data This leaves the input packet split if it is being split. It could be merged again, if thats preferred ? That would involve an extra malloc and memcpy though Signed-off-by: Michael Niedermayer --- libavformat/mux.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/mux.c b/libavformat/mux.c index 06d87de..3a19364 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -878,6 +878,9 @@ static int do_packet_auto_bsf(AVFormatContext *s, AVPacket *pkt) { } } + if (st->internal->nb_bsfcs) + av_packet_split_side_data(pkt); + for (i = 0; i < st->internal->nb_bsfcs; i++) { AVBSFContext *ctx = st->internal->bsfcs[i]; if (i > 0) {