From patchwork Mon Sep 7 13:17:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22158 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 122A844AF76 for ; Mon, 7 Sep 2020 16:24:48 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E0DF268AA42; Mon, 7 Sep 2020 16:24:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1A7E36881FC for ; Mon, 7 Sep 2020 16:24:41 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id s13so14352633wmh.4 for ; Mon, 07 Sep 2020 06:24:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=rt5NCvz1pOj8BmjUvj6qQz6xdS46qw7LVST49QmaCX8=; b=ESdFDvygSTttp7G6MImuyakYC0Ll+nprRwJ49wEct8vuopQR6/w+uDHoFoLPxAPmF7 HTzGn2vfPWVtdEKF2biEyv9yBSu4Y++WNcQIGsitaaN4ChhmLRlLU7lyrInYVZu0v+Mv Ab6Jgr3DHxLjDAzfPqpdw5ksE6prJSFOCBi4yuxIfvNZe2WWwYGT+CW3oNr0ZB5+259r 9XLf3JIGsth1XcfkOt8Wx8x4eNQJ50ZcUbKJh7NmyxE4+87R5FveWRd8TykSxnnJSDIh T6vAJe+lFsB9qBVBFvJKlOriP8Rp5fNfJPXEDI4B0QBCKUJ2CAuPucHO7qAWg3kHmcSy 75JA== 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:mime-version :content-transfer-encoding; bh=rt5NCvz1pOj8BmjUvj6qQz6xdS46qw7LVST49QmaCX8=; b=QyJbnPr8PbXWgYtpGUTUaR6a8vo+vspW6otT8kZkeNQA/Qj8zB20sycbR2eshtfpCY JNLuAWSmXvBwholSwI/gnBNq1C2ny4hJY3QmLh8gW1x6zm70GgfubCv6Q15cOXjcqVdS FryjJRyBVIKuhLAGEZqaWGv9rud/MNW33zLRCkSHtao4p8Y1n4rzGQWf8KjFITVeoNL2 2X8499XIesCwBf10nJ879xZQp+i6JAHHFRJ90sYThflTdW1cW5Rivh1dHLm8mGKg5mhn ES+NEA1xKPvYr9cF3hx7TOWIGQccEwvU9RXbfQsJjfHn0/FzlO9QutShEEsfkjrSZhbE ZPBw== X-Gm-Message-State: AOAM53255ca/cPP05eY2HkYosKrk1nkNgSdK+r25bLiWC4jbJ9hIwbB2 JSPioUgsDlldvjC8yC9+2Ex2pQocLXg= X-Google-Smtp-Source: ABdhPJxnGAKyL+Ia5hA10oXoS/jXzD+4oCE3eNQAQtK6/0nODP2eQeENaFIBdiDy+lh16Zp4W2Jw3Q== X-Received: by 2002:a7b:c111:: with SMTP id w17mr20001617wmi.109.1599484632825; Mon, 07 Sep 2020 06:17:12 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id z9sm27542416wmg.46.2020.09.07.06.17.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Sep 2020 06:17:12 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Sep 2020 15:17:04 +0200 Message-Id: <20200907131706.29060-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/extract_extradata: Consolidate zeroing extradata padding 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavcodec/extract_extradata_bsf.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavcodec/extract_extradata_bsf.c b/libavcodec/extract_extradata_bsf.c index 1fead74b57..6e80076522 100644 --- a/libavcodec/extract_extradata_bsf.c +++ b/libavcodec/extract_extradata_bsf.c @@ -103,7 +103,6 @@ static int extract_extradata_av1(AVBSFContext *ctx, AVPacket *pkt, av_buffer_unref(&filtered_buf); return AVERROR(ENOMEM); } - memset(extradata + extradata_size, 0, AV_INPUT_BUFFER_PADDING_SIZE); *data = extradata; *size = extradata_size; @@ -198,7 +197,6 @@ static int extract_extradata_h2645(AVBSFContext *ctx, AVPacket *pkt, av_buffer_unref(&filtered_buf); return AVERROR(ENOMEM); } - memset(extradata + extradata_size, 0, AV_INPUT_BUFFER_PADDING_SIZE); *data = extradata; *size = extradata_size; @@ -254,7 +252,6 @@ static int extract_extradata_vc1(AVBSFContext *ctx, AVPacket *pkt, return AVERROR(ENOMEM); memcpy(*data, pkt->data, extradata_size); - memset(*data + extradata_size, 0, AV_INPUT_BUFFER_PADDING_SIZE); *size = extradata_size; if (s->remove) { @@ -285,7 +282,6 @@ static int extract_extradata_mpeg12(AVBSFContext *ctx, AVPacket *pkt, return AVERROR(ENOMEM); memcpy(*data, pkt->data, *size); - memset(*data + *size, 0, AV_INPUT_BUFFER_PADDING_SIZE); if (s->remove) { pkt->data += *size; @@ -315,7 +311,6 @@ static int extract_extradata_mpeg4(AVBSFContext *ctx, AVPacket *pkt, return AVERROR(ENOMEM); memcpy(*data, pkt->data, *size); - memset(*data + *size, 0, AV_INPUT_BUFFER_PADDING_SIZE); if (s->remove) { pkt->data += *size; @@ -377,6 +372,7 @@ static int extract_extradata_filter(AVBSFContext *ctx, AVPacket *pkt) goto fail; if (extradata) { + memset(extradata + extradata_size, 0, AV_INPUT_BUFFER_PADDING_SIZE); ret = av_packet_add_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, extradata, extradata_size); if (ret < 0) {