From patchwork Thu Mar 16 04:20:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wm4 X-Patchwork-Id: 2947 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp587548vsy; Wed, 15 Mar 2017 21:21:19 -0700 (PDT) X-Received: by 10.223.157.38 with SMTP id k38mr2813234wre.156.1489638079649; Wed, 15 Mar 2017 21:21:19 -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 l66si2888396wmb.111.2017.03.15.21.21.19; Wed, 15 Mar 2017 21:21:19 -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; dkim=neutral (body hash did not verify) header.i=@googlemail.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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A50C068830F; Thu, 16 Mar 2017 06:20:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C9C9C688286 for ; Thu, 16 Mar 2017 06:20:49 +0200 (EET) Received: by mail-wm0-f68.google.com with SMTP id x124so1999314wmf.3 for ; Wed, 15 Mar 2017 21:21:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zDtULhsIQ5HtHyzYyuTtZy6iq1qPKJ+v9cyOAGsKVXI=; b=JP5vp+oqXbJusmydXs+wAlOP4jXwytpItv2RTCRIVnoY1mAG0e76Lbxr9aETEntvgo KjG86D9H9mGPSq5LqR+7Y9oYG0cz8xQt49xEWmB7muSm0DQmObInG0y4ZapWQTpQeN06 KpELf+0MRZq/+Nt2oCrVwL3Ulpec6zpfsH7Tmhe5RsV0cxLI4A+MBUaZvcQT8H2q3ubp BCY58pS/R4ldyh7GJSLoUfx63SOy69JkMsXgYkKXnpUOaCpQf8XYBWfp2OR2mOj99Zso ymVJ8FaK9cJQV1RGz0sZw7MIWqP9Sj+i6WF7UgH3OQYO20AA8iql8NEGiAYEeQ2uu3+M I76Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zDtULhsIQ5HtHyzYyuTtZy6iq1qPKJ+v9cyOAGsKVXI=; b=ka4dclU6ArPQu00k2giEkoDBobQAUjLfM/DeHYJF9vBQ75ZtFHnfDYBVG/PQqOQ/YA 7f6KD6gilkOn60KKzYTJW8Tp1Ek05PiD/Du7aW/g79NAH1NCTbeVwMnYd5kHnUC+gI/2 4QpQKNXjIZYFUs+Yic/D80Wiz0hohbPyrtIBHQxNwCP7mWEHYE8tX8l7jcabB0mfhY6f 2EywYHaSY/Hm24jcrCElzO6WVMemYiXM5YAabOIqPqRzstfB8fHaFsoD6KVvV89fwpl1 jy2BZTyJlQ6tSjcID0kxi6N2+nbcFPdrWlpjBG+4UjzQ+PIvU51GxxV9H02r9qJtPYE2 r7Cg== X-Gm-Message-State: AFeK/H3DSRfibtEgp6AakjzE5X3JEx8QvxmsA+V3iZyFodti5WvPQsAYYA+PMk2kgwP34w== X-Received: by 10.28.166.133 with SMTP id p127mr23346040wme.62.1489638065618; Wed, 15 Mar 2017 21:21:05 -0700 (PDT) Received: from localhost.localdomain (p4FF008BE.dip0.t-ipconnect.de. [79.240.8.190]) by smtp.googlemail.com with ESMTPSA id t195sm2693200wmt.32.2017.03.15.21.21.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Mar 2017 21:21:04 -0700 (PDT) From: wm4 To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Mar 2017 05:20:52 +0100 Message-Id: <20170316042052.29707-2-nfxjfg@googlemail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170316042052.29707-1-nfxjfg@googlemail.com> References: <20170316042052.29707-1-nfxjfg@googlemail.com> Subject: [FFmpeg-devel] [PATCH 2/2] ffmpeg: don't unnecessarily use a deprecated API function 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: wm4 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Since we've disabled side data merging in ffmpeg.c, this really changes nothing. --- ffmpeg.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index 63fc1bc5f4..bc2157e544 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -818,7 +818,6 @@ static void output_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost) 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; @@ -4245,8 +4244,6 @@ static int process_input(int file_index) /* add the stream-global side data to the first packet */ if (ist->nb_packets == 1) { - if (ist->st->nb_side_data) - av_packet_split_side_data(&pkt); for (i = 0; i < ist->st->nb_side_data; i++) { AVPacketSideData *src_sd = &ist->st->side_data[i]; uint8_t *dst_data;