From patchwork Fri Mar 13 13:28:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18173 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 8B0C044A111 for ; Fri, 13 Mar 2020 15:28:53 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6749968B0BE; Fri, 13 Mar 2020 15:28:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7F15268ACA6 for ; Fri, 13 Mar 2020 15:28:47 +0200 (EET) Received: by mail-wm1-f65.google.com with SMTP id a132so9952963wme.1 for ; Fri, 13 Mar 2020 06:28:47 -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=h24APtFrD1fkccQZj6wxRGgCX9Kn/cPiNX2aHQRfIWk=; b=lYUjKdoWldPN/eaG/X64oNst4q7btA4A4KHV/fv3Tg5kSjbY6oadAw+6nILGpcb/Lm cSDymC+xpIJUFFyCcO15Zkwi4N6m1FaCUpKVqGGEWbvBxOfitsevpcA2poJ6wCBSULRk hzGOur7QBtlvfVbzFVlfoMgsz4j23Y4rreEI2+qa2Q3aJKDrRLDPnM48itUy5I7lnlhx 40BL4UXBTlZRmBQrOhKtoZZRMyiIbbj1T47W/pK5iu8q5iqSzFBXJQSikUH5zN8G+9bV GLk7eQBUS7VkSYnXRzaIFwR2OOtitla1bhy+0aIY7yT9XpPHRdMMeQ0hWbmNntJ8aIMJ rKKg== 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=h24APtFrD1fkccQZj6wxRGgCX9Kn/cPiNX2aHQRfIWk=; b=LpOLys/5QZz6CHmERWhkYjtzkMthTpGL/o6sIRcn1j9BuaJqDfsG8DJvUsQaWIDT2Q XS9eOw/sgf7XNKkc8+/PcMuPv9uajfRSmY/ZyDc+fc2XkFBGe886c4QhejFw3TQ1tE4U QDBPJ1oso3ocn9TR7uMcd4R64C+HTJdt60U5E92qKOBwgcpEVIpM5Nhdds5FywylN9cW b6nwfq6dMl1EMhwAximm64Kkcb6BiqErnClDCMVAHqKPuFJXw6Eq+WiTXZF4ygpcG7Ft 4/aN/VGPVee2b370RpaDRBGyIG4/tERAOP2ONmJQhuJO7Mdcc6/OutJiKUWT2YLaXZcQ F8ag== X-Gm-Message-State: ANhLgQ2EAkDpW/T8Ik37tZ8yW61lk3pIUOHUl+Jw6RqfiHb4kI1A3Prq 5pAw3aRTQI7Y5Yoku6JjlMr9dUlL X-Google-Smtp-Source: ADFU+vvfx+ENMfSxEqJ6zlnd9PUAEjj+rxa7dKHcxg+Vvt727cfhElAuyOPh8/pBJapVTxJiu/fxkQ== X-Received: by 2002:a05:600c:2c10:: with SMTP id q16mr11046851wmg.69.1584106126354; Fri, 13 Mar 2020 06:28:46 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab4b.dynamic.kabel-deutschland.de. [188.193.171.75]) by smtp.gmail.com with ESMTPSA id a199sm8115786wme.29.2020.03.13.06.28.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Mar 2020 06:28:44 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 13 Mar 2020 14:28:33 +0100 Message-Id: <20200313132833.10367-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200212153127.1255-1-andreas.rheinhardt@gmail.com> References: <20200212153127.1255-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] 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 --- Resending because of 3117f47f19d051d47ba29c9b78c2ca525f0fdb45. fftools/ffplay.c | 2 +- libavcodec/qsvdec_h2645.c | 2 +- libavcodec/qsvdec_other.c | 2 +- libavformat/fifo.c | 1 - libavformat/img2enc.c | 8 ++++---- libavformat/tee.c | 1 - 6 files changed, 7 insertions(+), 9 deletions(-) diff --git a/fftools/ffplay.c b/fftools/ffplay.c index f6511e4afd..2ed4b22d3e 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -2977,7 +2977,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/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;