From patchwork Sun Jun 21 08:53:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20536 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 DAF3B44B677 for ; Sun, 21 Jun 2020 11:54:25 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C5A8B68B853; Sun, 21 Jun 2020 11:54:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CB41268B84E for ; Sun, 21 Jun 2020 11:54:18 +0300 (EEST) Received: by mail-wr1-f52.google.com with SMTP id b6so13680034wrs.11 for ; Sun, 21 Jun 2020 01:54:18 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=av50nar997QI0Mz18/7tIci8jTKzAvpuMNfa9Y8f8w8=; b=L1z8mYcQ29ouYOmbkniqtyIMFAk5UB9WpU/hq6swyTJ31I1TUpneijl9Ca0kDc3QA3 EAHmWd30mHi9KZvGxpeucKe7PX/1LAdEBr8fAyt6uXdsjuGyg2TfFBe4OJ39Imvs+2mK Vp+zWEwxp5agG5R8J2PM8riOmJ/pUjWMLHjryHANTN8fuPHFCTvPoXNThlfjOH1ce4Zv R6MYA5NEa2o44t1T9PWWTZ+1L1zRD6BoLDwOwBHjdlTAt1AdVCZikYPn+NIpL9btNnu9 jljqX1PKR+GxikL4VKONRnDxDoRCwJv6I30XIgSZOPXUvKlP6glmp7O70lj3W9NnC04L kBeA== 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:mime-version:content-transfer-encoding; bh=av50nar997QI0Mz18/7tIci8jTKzAvpuMNfa9Y8f8w8=; b=oV247as947PPb8yBKganf03RMiXD1fH3fHLHEcL097FGSNx8M/PUnzh3gSoQmHLHV+ +50uewjbYnMByesMpqcxmptsMbWQXDuw4ahacyr4EZuzGG/865oO9nNC3ecHQL4HG3LQ NZEvcq85+8feWf+78i2fSGcruWLXr8S87irb34rgjs6CgFFwmoQWxexB59PEpP/nFqSP sCVuYMCxtbYbMFg1mHYqKNdi81yEBcgHKuHAkJHI0T/dAIgy0VfLE37zSxZr3ssHppoD vOqHUuXI27NhwJRQfNUrt7kpR4mXQVKE8Kp6o93oQtFcqcNxOGEGvz29gnz+fbDi6CLp P8fQ== X-Gm-Message-State: AOAM533ASPYCFxBZLeRWNtWy10p8l97hohSsTM0crk9Rv1QOLYgZS7tx veTTu/xPLmJfQm4tbwC6MoXRiT5B X-Google-Smtp-Source: ABdhPJz96CCqCwT3xDd3iiKSz8GUJo9Ef3NUJt1a2JtXaCEHzIWxYuKN7XrO5SYldpto9MQKru7jOQ== X-Received: by 2002:a5d:484b:: with SMTP id n11mr3971945wrs.320.1592729657750; Sun, 21 Jun 2020 01:54:17 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id b143sm12616054wme.20.2020.06.21.01.54.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jun 2020 01:54:16 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 21 Jun 2020 10:53:49 +0200 Message-Id: <20200621085349.22370-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200621085349.22370-1-andreas.rheinhardt@gmail.com> References: <20200621085349.22370-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/5] avcodec, avformat: Remove unnecessary initializations of side data size 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/audiotoolboxdec.c | 2 +- libavcodec/decode.c | 2 +- libavcodec/libvpxdec.c | 2 +- libavformat/adtsenc.c | 2 +- libavformat/apngenc.c | 2 +- libavformat/flvenc.c | 2 +- libavformat/latmenc.c | 2 +- libavformat/matroskaenc.c | 6 ++---- libavformat/movenc.c | 2 +- libavformat/mp3enc.c | 2 +- libavformat/rtpenc.c | 2 +- libavformat/segment.c | 2 +- 12 files changed, 13 insertions(+), 15 deletions(-) diff --git a/libavcodec/audiotoolboxdec.c b/libavcodec/audiotoolboxdec.c index 5c0a9de8f6..66055b79aa 100644 --- a/libavcodec/audiotoolboxdec.c +++ b/libavcodec/audiotoolboxdec.c @@ -483,7 +483,7 @@ static int ffat_decode(AVCodecContext *avctx, void *data, if (avctx->codec_id == AV_CODEC_ID_AAC) { if (!at->extradata_size) { uint8_t *side_data; - int side_data_size = 0; + int side_data_size; side_data = av_packet_get_side_data(avpkt, AV_PKT_DATA_NEW_EXTRADATA, &side_data_size); diff --git a/libavcodec/decode.c b/libavcodec/decode.c index a4e50c0d03..de9c079f9d 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -66,7 +66,7 @@ typedef struct FramePool { static int apply_param_change(AVCodecContext *avctx, const AVPacket *avpkt) { - int size = 0, ret; + int size, ret; const uint8_t *data; uint32_t flags; int64_t val; diff --git a/libavcodec/libvpxdec.c b/libavcodec/libvpxdec.c index 1063c546b0..eddcea8941 100644 --- a/libavcodec/libvpxdec.c +++ b/libavcodec/libvpxdec.c @@ -220,7 +220,7 @@ static int vpx_decode(AVCodecContext *avctx, struct vpx_image *img, *img_alpha; int ret; uint8_t *side_data = NULL; - int side_data_size = 0; + int side_data_size; ret = decode_frame(avctx, &ctx->decoder, avpkt->data, avpkt->size); if (ret) diff --git a/libavformat/adtsenc.c b/libavformat/adtsenc.c index d937e2bea9..9e285752eb 100644 --- a/libavformat/adtsenc.c +++ b/libavformat/adtsenc.c @@ -169,7 +169,7 @@ static int adts_write_packet(AVFormatContext *s, AVPacket *pkt) return 0; if (!par->extradata_size) { uint8_t *side_data; - int side_data_size = 0, ret; + int side_data_size, ret; side_data = av_packet_get_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, &side_data_size); diff --git a/libavformat/apngenc.c b/libavformat/apngenc.c index 88cd8054d6..7ad6a923d5 100644 --- a/libavformat/apngenc.c +++ b/libavformat/apngenc.c @@ -119,7 +119,7 @@ static int flush_packet(AVFormatContext *format_context, AVPacket *packet) AVIOContext *io_context = format_context->pb; AVStream *codec_stream = format_context->streams[0]; uint8_t *side_data = NULL; - int side_data_size = 0; + int side_data_size; av_assert0(apng->prev_packet); diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 5cf3ce8a1a..1cfcdc6392 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -902,7 +902,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) if (par->codec_id == AV_CODEC_ID_AAC || par->codec_id == AV_CODEC_ID_H264 || par->codec_id == AV_CODEC_ID_MPEG4) { - int side_size = 0; + int side_size; uint8_t *side = av_packet_get_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, &side_size); if (side && side_size > 0 && (side_size != par->extradata_size || memcmp(side, par->extradata, side_size))) { ret = ff_alloc_extradata(par, side_size); diff --git a/libavformat/latmenc.c b/libavformat/latmenc.c index 5ae677f5da..72b7f72f22 100644 --- a/libavformat/latmenc.c +++ b/libavformat/latmenc.c @@ -165,7 +165,7 @@ static int latm_write_packet(AVFormatContext *s, AVPacket *pkt) return ff_raw_write_packet(s, pkt); else { uint8_t *side_data; - int side_data_size = 0, ret; + int side_data_size, ret; side_data = av_packet_get_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, &side_data_size); diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index eaed02bc92..105ed5197e 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2007,7 +2007,7 @@ static int mkv_write_block(AVFormatContext *s, AVIOContext *pb, AVCodecParameters *par = s->streams[pkt->stream_index]->codecpar; mkv_track *track = &mkv->tracks[pkt->stream_index]; uint8_t *data = NULL, *side_data = NULL; - int err = 0, offset = 0, size = pkt->size, side_data_size = 0; + int err = 0, offset = 0, size = pkt->size, side_data_size; int64_t ts = track->write_dts ? pkt->dts : pkt->pts; uint64_t additional_id; int64_t discard_padding = 0; @@ -2122,12 +2122,10 @@ static int mkv_write_vtt_blocks(AVFormatContext *s, AVIOContext *pb, const AVPac int64_t ts = track->write_dts ? pkt->dts : pkt->pts; const int flags = 0; - id_size = 0; id = av_packet_get_side_data(pkt, AV_PKT_DATA_WEBVTT_IDENTIFIER, &id_size); id = id ? id : ""; - settings_size = 0; settings = av_packet_get_side_data(pkt, AV_PKT_DATA_WEBVTT_SETTINGS, &settings_size); settings = settings ? settings : ""; @@ -2184,7 +2182,7 @@ static int mkv_check_new_extra_data(AVFormatContext *s, const AVPacket *pkt) mkv_track *track = &mkv->tracks[pkt->stream_index]; AVCodecParameters *par = s->streams[pkt->stream_index]->codecpar; uint8_t *side_data; - int side_data_size = 0, ret; + int side_data_size, ret; side_data = av_packet_get_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, &side_data_size); diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 6eeac8efa6..b8e45760ee 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -5788,7 +5788,7 @@ static int mov_write_single_packet(AVFormatContext *s, AVPacket *pkt) trk->par->codec_id == AV_CODEC_ID_AAC || trk->par->codec_id == AV_CODEC_ID_AV1 || trk->par->codec_id == AV_CODEC_ID_FLAC) { - int side_size = 0; + int side_size; uint8_t *side = av_packet_get_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, &side_size); if (side && side_size > 0 && (side_size != par->extradata_size || memcmp(side, par->extradata, side_size))) { void *newextra = av_mallocz(side_size + AV_INPUT_BUFFER_PADDING_SIZE); diff --git a/libavformat/mp3enc.c b/libavformat/mp3enc.c index 14d4b6e0af..a3586e1f86 100644 --- a/libavformat/mp3enc.c +++ b/libavformat/mp3enc.c @@ -354,7 +354,7 @@ static int mp3_write_audio_packet(AVFormatContext *s, AVPacket *pkt) if (mp3->xing_offset) { uint8_t *side_data = NULL; - int side_data_size = 0; + int side_data_size; mp3_xing_add_frame(mp3, pkt); mp3->audio_size += pkt->size; diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c index 63047beccc..9ef7e9094d 100644 --- a/libavformat/rtpenc.c +++ b/libavformat/rtpenc.c @@ -589,7 +589,7 @@ static int rtp_write_packet(AVFormatContext *s1, AVPacket *pkt) break; case AV_CODEC_ID_H263: if (s->flags & FF_RTP_FLAG_RFC2190) { - int mb_info_size = 0; + int mb_info_size; const uint8_t *mb_info = av_packet_get_side_data(pkt, AV_PKT_DATA_H263_MB_INFO, &mb_info_size); diff --git a/libavformat/segment.c b/libavformat/segment.c index 2ff2b5372e..f67456fa57 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -873,7 +873,7 @@ static int seg_write_packet(AVFormatContext *s, AVPacket *pkt) return AVERROR(EINVAL); if (!st->codecpar->extradata_size) { - int pkt_extradata_size = 0; + int pkt_extradata_size; uint8_t *pkt_extradata = av_packet_get_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, &pkt_extradata_size); if (pkt_extradata && pkt_extradata_size > 0) { ret = ff_alloc_extradata(st->codecpar, pkt_extradata_size);