From patchwork Wed Feb 12 15:31:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17761 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 242C344B416 for ; Wed, 12 Feb 2020 17:31:46 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E81C468AD7A; Wed, 12 Feb 2020 17:31:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EEE72689F6B for ; Wed, 12 Feb 2020 17:31:38 +0200 (EET) Received: by mail-wr1-f66.google.com with SMTP id r11so2864426wrq.10 for ; Wed, 12 Feb 2020 07:31:38 -0800 (PST) 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=7tRA2vyLfIqlH3VS44xH8eFNeyUHcrxPPKyLKm4nU9U=; b=kvbE16wrv3O32G8+2ELK9FZjAkUitf66VQ/KUdjSwBvgWgF8iFDKc0AsQWGc6QnxLf tpTcQS8TMdTVupBXO0xvxaxVWemWM7rsIYnkT4AoM2niTVR4hq4K9wHOKdY9DKbfs6Rg ECp1pL3dVbkPey2EOmb5IwCqw2M+mU89ICo5+F2u2ZtkbJ2y0wmu4dck7H6DEQzm/b+7 otLHZPTvaq/uegsn0FlnI/h6qFFNIz4Hdq0aQrz0O9+yaUv7ed9NUY45RmP4wTt42Jir rhPVsJDod0NIyygcSXYKbQrcHRCQ6s1f2OLCtIOhZXoTRyEFaBw829mBCYR6PBveGQOc ogag== 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=7tRA2vyLfIqlH3VS44xH8eFNeyUHcrxPPKyLKm4nU9U=; b=iUTNJBS6BLy96KFfV/1Q3e11SYvDweO/kJ2Fk1L3zEPFdFINLWMnFCb9Ev/avglXKN IZ/S83ziwKWaaz4+Z4z8eu/kwcIaSUxNX742NOIP86RQAFwHT3SixRZjiDORgIO0wv33 ijn/rMTRRbLSLePThhyrw0HeZW5EyVsi1oW47gxtGmQY0CKmb/zbrzWZhyLI2i4dAoBI gi/kgdBVr2i0fy9uLP4xJp0nrQkiv67DH6097puXLMfIxCkGstsOI3gCjEFD07vWjrfJ H0uUSE+pA5SIRjcMlckKr4livF7b7kvLVsPrJWwX5EpRaa5qRSM3w6aeNFEeDm3TF3im ZLbQ== X-Gm-Message-State: APjAAAUKo7piD5Cf/c0IyC7WKyH9Frh7xigqsYPzwhZTCjH4ldNLU+gl kr6lOmQ/EvclR8J8qFELM96XOptu X-Google-Smtp-Source: APXvYqyTuSohryzqHLDylmFcSkSTOB5g7hv9dEYY0QWB0BDOEa64WGjXRB+b4AtR5AHmgl8+3dsJZQ== X-Received: by 2002:a05:6000:367:: with SMTP id f7mr15574602wrf.174.1581521498232; Wed, 12 Feb 2020 07:31:38 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1ab4b.dynamic.kabel-deutschland.de. [188.193.171.75]) by smtp.gmail.com with ESMTPSA id a16sm979459wrt.30.2020.02.12.07.31.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Feb 2020 07:31:37 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Feb 2020 16:31:26 +0100 Message-Id: <20200212153127.1255-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200212150223.28790-1-andreas.rheinhardt@gmail.com> References: <20200212150223.28790-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] ffplay, avcodec, avformat: Don't initialize before av_packet_ref() 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" It already initializes the packet. Signed-off-by: Andreas Rheinhardt --- fftools/ffplay.c | 2 +- libavcodec/cuviddec.c | 2 +- libavcodec/qsvdec_h2645.c | 2 +- libavcodec/qsvdec_other.c | 2 +- libavformat/fifo.c | 1 - libavformat/img2enc.c | 8 ++++---- libavformat/tee.c | 1 - 7 files changed, 8 insertions(+), 10 deletions(-) diff --git a/fftools/ffplay.c b/fftools/ffplay.c index fee0619f7c..746e5c0e69 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -2974,7 +2974,7 @@ static int read_thread(void *arg) } if (is->queue_attachments_req) { if (is->video_st && is->video_st->disposition & AV_DISPOSITION_ATTACHED_PIC) { - AVPacket copy = { 0 }; + AVPacket copy; if ((ret = av_packet_ref(©, &is->video_st->attached_pic)) < 0) goto fail; packet_queue_put(&is->videoq, ©); diff --git a/libavcodec/cuviddec.c b/libavcodec/cuviddec.c index acee78cf2c..8b1659dc2e 100644 --- a/libavcodec/cuviddec.c +++ b/libavcodec/cuviddec.c @@ -387,7 +387,7 @@ static int cuvid_decode_packet(AVCodecContext *avctx, const AVPacket *avpkt) AVCUDADeviceContext *device_hwctx = device_ctx->hwctx; CUcontext dummy, cuda_ctx = device_hwctx->cuda_ctx; CUVIDSOURCEDATAPACKET cupkt; - AVPacket filter_packet = { 0 }; + AVPacket filter_packet; AVPacket filtered_packet = { 0 }; int ret = 0, eret = 0, is_flush = ctx->decoder_flushing; diff --git a/libavcodec/qsvdec_h2645.c b/libavcodec/qsvdec_h2645.c index 730feed20a..02c41883b6 100644 --- a/libavcodec/qsvdec_h2645.c +++ b/libavcodec/qsvdec_h2645.c @@ -125,7 +125,7 @@ static int qsv_decode_frame(AVCodecContext *avctx, void *data, /* buffer the input packet */ if (avpkt->size) { - AVPacket input_ref = { 0 }; + AVPacket input_ref; if (av_fifo_space(s->packet_fifo) < sizeof(input_ref)) { ret = av_fifo_realloc2(s->packet_fifo, diff --git a/libavcodec/qsvdec_other.c b/libavcodec/qsvdec_other.c index ff2834c20b..b4df76739c 100644 --- a/libavcodec/qsvdec_other.c +++ b/libavcodec/qsvdec_other.c @@ -123,7 +123,7 @@ static int qsv_decode_frame(AVCodecContext *avctx, void *data, /* buffer the input packet */ if (avpkt->size) { - AVPacket input_ref = { 0 }; + AVPacket input_ref; if (av_fifo_space(s->packet_fifo) < sizeof(input_ref)) { ret = av_fifo_realloc2(s->packet_fifo, diff --git a/libavformat/fifo.c b/libavformat/fifo.c index 7b37fff6da..d11dc6626c 100644 --- a/libavformat/fifo.c +++ b/libavformat/fifo.c @@ -536,7 +536,6 @@ static int fifo_write_packet(AVFormatContext *avf, AVPacket *pkt) int ret; if (pkt) { - av_init_packet(&msg.pkt); ret = av_packet_ref(&msg.pkt,pkt); if (ret < 0) return ret; diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c index a2786ec6f8..b303d38239 100644 --- a/libavformat/img2enc.c +++ b/libavformat/img2enc.c @@ -78,7 +78,7 @@ static int write_muxed_file(AVFormatContext *s, AVIOContext *pb, AVPacket *pkt) VideoMuxData *img = s->priv_data; AVCodecParameters *par = s->streams[pkt->stream_index]->codecpar; AVStream *st; - AVPacket pkt2 = {0}; + AVPacket pkt2; AVFormatContext *fmt = NULL; int ret; @@ -88,8 +88,8 @@ static int write_muxed_file(AVFormatContext *s, AVIOContext *pb, AVPacket *pkt) return ret; st = avformat_new_stream(fmt, NULL); if (!st) { - avformat_free_context(fmt); - return AVERROR(ENOMEM); + ret = AVERROR(ENOMEM); + goto out; } st->id = pkt->stream_index; @@ -105,8 +105,8 @@ static int write_muxed_file(AVFormatContext *s, AVIOContext *pb, AVPacket *pkt) (ret = av_interleaved_write_frame(fmt, &pkt2)) < 0 || (ret = av_write_trailer(fmt))) {} -out: av_packet_unref(&pkt2); +out: avformat_free_context(fmt); return ret; } diff --git a/libavformat/tee.c b/libavformat/tee.c index 56669d9d8e..f2b11fcb35 100644 --- a/libavformat/tee.c +++ b/libavformat/tee.c @@ -564,7 +564,6 @@ static int tee_write_packet(AVFormatContext *avf, AVPacket *pkt) if (s2 < 0) continue; - memset(&pkt2, 0, sizeof(AVPacket)); if ((ret = av_packet_ref(&pkt2, pkt)) < 0) if (!ret_all) { ret_all = ret;