From patchwork Sat Nov 2 17:41:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 16084 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 1B79C4481F4 for ; Sat, 2 Nov 2019 19:41:36 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EBBEB68AFFC; Sat, 2 Nov 2019 19:41:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbgau1.qq.com (smtpbgau1.qq.com [54.206.16.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BA6D268AF42 for ; Sat, 2 Nov 2019 19:41:27 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1572716481; bh=/thNmwYXUZ+6DEQG/C1EJ3beQT2zC8nwaQ6RXME5fKI=; h=From:To:Subject:Date:Message-Id; b=nCCnZoUKKJQjSGj9FwtYlpryH0g0tgIDb9RZJLIoGYl2C4co6fSraKnqqMaFUFOxG tV1D3GUtz++8SPiBBSo+/KUFr4ab0miY/zVuPR/t/Y8qM7Gw2uuhFV9GRqFshWn5a2 bArMGJ7j7VTkD2X6+9hy1AHtewYIAo4NTwQxGUDo= X-QQ-mid: esmtp3t1572716480tv5zusljn Received: from localhost.localdomain (unknown [58.250.254.153]) by esmtp4.qq.com (ESMTP) with id ; Sun, 03 Nov 2019 01:41:19 +0800 (CST) X-QQ-SSF: A1000000000000N0UF2000000000002 X-QQ-FEAT: Qz5Trehbz7YH8RQDm9wKLtcZ0vWfDSxkGcdMNNOAN8MaE3OC4Tficod8/Y/Wl MtWV2F0htD7EGJE4L5Jq4yl5WyVE1qs0O6JCPM4/B4/xr+ylpPOv9k9t3z4usvUZg9Rrar8 9mC5FtytWDRoiUKsZ+MrFFbpSfBOT9bG1Ko+xgB1/c43ryKjrWoB/mxuOOSRC9s7peJXZ0T fVN0ZMCBORrHNq3B9TGGqk/uAceGkORxSG94y4b7qApvF5Xi8qpQVYybL82dt0mBrvPpL87 nrP7Nz0ZaRif0VIC5BHBuqK53H7umtdtMXfg== X-QQ-GoodBg: 0 From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 3 Nov 2019 01:41:18 +0800 Message-Id: <20191102174118.26063-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-QQ-SENDSIZE: 520 Feedback-ID: esmtp:foxmail.com:bgforeign:bgforeign4 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [RFC PATCH v2] avutil/frame: fix remove_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 Cc: Zhao Zhili MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" remove_side_data is supposed to remove a single instance by design. Since new_side_data() doesn't forbid add multiple instances of the same type, remove_side_data should deal with that. --- I'm afraid this patch makes it harder to enforce single entry per type. libavutil/frame.c | 2 +- libavutil/frame.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libavutil/frame.c b/libavutil/frame.c index dcf1fc3d17..e4038096c2 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -806,7 +806,7 @@ void av_frame_remove_side_data(AVFrame *frame, enum AVFrameSideDataType type) { int i; - for (i = 0; i < frame->nb_side_data; i++) { + for (i = frame->nb_side_data - 1; i >= 0; i--) { AVFrameSideData *sd = frame->side_data[i]; if (sd->type == type) { free_side_data(&frame->side_data[i]); diff --git a/libavutil/frame.h b/libavutil/frame.h index 5d3231e7bb..b5afb58634 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -920,8 +920,7 @@ AVFrameSideData *av_frame_get_side_data(const AVFrame *frame, enum AVFrameSideDataType type); /** - * If side data of the supplied type exists in the frame, free it and remove it - * from the frame. + * Remove and free all side data instances of the given type. */ void av_frame_remove_side_data(AVFrame *frame, enum AVFrameSideDataType type);