From patchwork Fri May 12 16:58:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 3657 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp417545vsd; Fri, 12 May 2017 09:59:41 -0700 (PDT) X-Received: by 10.28.158.76 with SMTP id h73mr3486645wme.140.1494608381189; Fri, 12 May 2017 09:59:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494608381; cv=none; d=google.com; s=arc-20160816; b=dRnmb9LPg5KrKbu9yaHSmGK9M3z15tEnaRecDMWpg8R7TiJifJO6d7rEgRxWz/+yjO 72OX9DUtlH9IWDI0OPTbrAaINqkvZdulW8IUqbDlcLHbrBiHi7rPESD89P8psWBa5QJi DPBE3h34jSuKkeAejY8bfZ5ubtiycyK/6DE0a63HzHjqKYytYTcA95oW5wrevTV7bt94 oTU3ebwaSWPCKlQR9OCWmB6FUUnbLzYWRiOwWoCB8LYqVGBIcUwzKwBbfd5BzWDy//t8 UzLCtcBMjGiKRuersIPlDj6F8MJJ1LgXhTzycTqdZc3vko8Je9pv8Dp2z1QsCq9/0CE9 yUJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=RTirVDPEmMv8ldrwkcVVyQALzsGobQM7iIrFgGX5mmE=; b=fx4fu1PIgBJHcHOZNDAPirsIbFsRKc02yYGe8jfQ24uCk+EuIU5JnmTUzB3iMH2YA5 EKlVJ/JS8P+XiVqKsCu8V0NUMOq+OPYadqTVQR3+y2s4NA5fR1IZGg02lynUabnjtIFT LyL8cM8rHd+es2Dpx2VWAH3qquiVDZ+97LVZmMIrt+UWHnuexIo0QZezVV3EVeOrMlw0 JZ5fFwCvXaOLp0CLv7IayXJOzC0klUQPWdF0zbiSVKSq5E442Kyk7YpFhpGZ19Vtp8wz UJbPC6/+674nlMXpOPddQCke6m1vQbeDS7BAh4RPjUXSxbczvvsNASm5wwtaXDaCgzF9 zaRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.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=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a197si4431094wma.151.2017.05.12.09.59.40; Fri, 12 May 2017 09:59:41 -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=@gmail.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=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A4706689766; Fri, 12 May 2017 19:59:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f195.google.com (mail-qk0-f195.google.com [209.85.220.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EB45D680B0F for ; Fri, 12 May 2017 19:59:22 +0300 (EEST) Received: by mail-qk0-f195.google.com with SMTP id u75so8546582qka.1 for ; Fri, 12 May 2017 09:59:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=uGdt5YzXncvFRYYF2Ki17ofaOEtdZSf1SFc2Kutd+Rg=; b=gdX3wnNLdxhOT9YR4ZHDQjsaN7BO7Zs0sp3b8NLgpzCvQ5D2+bRowvsI2YcxsCnSff lSj5l9gDHfPltEA8Za3+JYVRRKM1iaUIW+sLY3IDdKinYtiDgXzjZ/DfKj9LkNFvA4FE Aibn20NY5lpbXY2ICnfHNzyI6C0Ntgp+lG2mo4e1XZpKn1K60c5X+8+FRbvNYwJarLZK yvQz7R3Ne05VRTx0UxUTDty7oEluIX6I6X/yr/bwCkGhd3GOzG/Gpp46t+KJAUtnJohK jkS07ke4ZBSmwETaBudBkVMiRiXrXaXW8qYJEbuEH54CV7xq8HzRtMcfWjl5CIq0Qq/q lHhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=uGdt5YzXncvFRYYF2Ki17ofaOEtdZSf1SFc2Kutd+Rg=; b=ev/kI3hNYlPK5j8mTTavggpF8n01mYXWF+N6kVbL3dF9Z5gR9OtX6eKkbAzCtzQXuk CCoquoEUup38CDBDxWpw+m0dukiaSsYemsMh93NShZGBbp4CjQgmHtwQNuWM/D8HXLLP HlCIRHmUULTVuTNXpJf9HQOuPNjvKGEdVyoB7IYEJc3U9m1Adxtm1OBLw2bk6DKIugzE KIbk3oVkF/io1JXhw/C97QfYGGDf7oaW9r/voDeEX6zyq4FQ2y9JMWB01I89JURd1x6+ h9iQuaWIm/BhxQ+Fzy3iF6EDuZxJqpNRO883xU/zfJ/POF0hsu1ovCeXTXT6XfW+TMd9 Ll/A== X-Gm-Message-State: AODbwcC4AXWpyD9/IK0KiU6np00c4DagQXgOZZoyEzfgwA6EiW3RdICc Ymc1663Ujno+Gi0/ X-Received: by 10.55.81.139 with SMTP id f133mr4999808qkb.125.1494608369164; Fri, 12 May 2017 09:59:29 -0700 (PDT) Received: from localhost.localdomain ([181.231.116.134]) by smtp.gmail.com with ESMTPSA id x44sm2587143qtc.68.2017.05.12.09.59.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 12 May 2017 09:59:28 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 12 May 2017 13:58:27 -0300 Message-Id: <20170512165827.8848-1-jamrial@gmail.com> X-Mailer: git-send-email 2.12.1 Subject: [FFmpeg-devel] [PATCH] avcodec/avpacket: allow only one element per type in packet side data 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" It was never meant to do otherwise, as av_packet_get_side_data() returns the first entry it finds of a given type. Based on code from libavformat's av_stream_add_side_data(). Signed-off-by: James Almer --- libavcodec/avpacket.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 26d561a00a..a04cdaf530 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -296,7 +296,18 @@ int av_packet_add_side_data(AVPacket *pkt, enum AVPacketSideDataType type, uint8_t *data, size_t size) { AVPacketSideData *tmp; - int elems = pkt->side_data_elems; + int i, elems = pkt->side_data_elems; + + for (i = 0; i < elems; i++) { + AVPacketSideData *sd = &pkt->side_data[i]; + + if (sd->type == type) { + av_free(sd->data); + sd->data = data; + sd->size = size; + return 0; + } + } if ((unsigned)elems + 1 > AV_PKT_DATA_NB) return AVERROR(ERANGE);