From patchwork Thu Mar 5 08:17:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Gaullier X-Patchwork-Id: 18052 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 45E9644AF1E for ; Thu, 5 Mar 2020 10:17:37 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2A8BB68AB33; Thu, 5 Mar 2020 10:17:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtp-2.arkena.net (smtp-2.arkena.net [95.81.173.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8F45268AA15 for ; Thu, 5 Mar 2020 10:17:29 +0200 (EET) Received: from secu2 (unknown [10.180.103.10]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp-2.arkena.net (Postfix) with ESMTPSA id 48Y3Ws1cRbzHh9F; Thu, 5 Mar 2020 08:17:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=cji.paris; s=20150421; t=1583396249; bh=I3QGByaKB2NsR1bOTR98DV1Pdev8rsRyu9hlgYVe/Mc=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=N4f6w5czv/l8ZJH3Y+Ys/2i0E1ZNodm9F1D1EIXgC/YE711swFMBCmT/ZDUJjfHJ2 a6y63uY2xUOrzcgh5+YOaYApL7uVy3cR9HuqsCYSRSuHTAFXMsC8XJNzv35rnntoAu 5mfu5VnNWKV9y1qFEvph42IGHoCcybhNRQ1DennY= Received: from arkena.com (unknown [172.16.3.159]) by secu2 (Postfix) with ESMTP id 51C043FA6D; Thu, 5 Mar 2020 09:14:56 +0100 (CET) From: Nicolas Gaullier To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 Mar 2020 09:17:23 +0100 Message-Id: <20200305081724.308-4-nicolas.gaullier@cji.paris> X-Mailer: git-send-email 2.25.0.windows.1 In-Reply-To: <20200305081724.308-1-nicolas.gaullier@cji.paris> References: <20200305081724.308-1-nicolas.gaullier@cji.paris> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v8 3/4] avcodec/utils: Fix ff_add_cpb_side_data() add twice 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: Nicolas Gaullier Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Makes it behave similarly to av_stream_add_side_data(). --- libavcodec/utils.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index c4dc136d3c..08e2d5b68b 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1980,6 +1980,11 @@ AVCPBProperties *ff_add_cpb_side_data(AVCodecContext *avctx) AVPacketSideData *tmp; AVCPBProperties *props; size_t size; + int i; + + for (i = 0; i < avctx->nb_coded_side_data; i++) + if (avctx->coded_side_data[i].type == AV_PKT_DATA_CPB_PROPERTIES) + return (AVCPBProperties *)avctx->coded_side_data[i].data; props = av_cpb_properties_alloc(&size); if (!props)