From patchwork Sun Dec 1 10:05:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16505 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 8DC264494CB for ; Sun, 1 Dec 2019 12:06:27 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 77C4A68AF06; Sun, 1 Dec 2019 12:06:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D0DDC68AE70 for ; Sun, 1 Dec 2019 12:06:20 +0200 (EET) Received: by mail-wm1-f66.google.com with SMTP id f129so19756741wmf.2 for ; Sun, 01 Dec 2019 02:06:20 -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=k1xZFVLiBFjicuRZkER5p5qv43DfCK1C3WF78qOoWaE=; b=Yt0LFod93WcfXwl+GbMrCD7PZvqrH8NFCTpkKowkDO/Z+9EMi6iV/XSSXSJxxY6CGL dwghnMpwan1TtJ3fhAHFe9VSss/DfITthUjy81GRjFpOlJPbZ87xDO/jTMWWQgOWwAou Rw3qHcv/4lo4Zhd7zw1NN1z1OHMpWE8MjkEUAOsYtz6Hod/KDfWbDy5PGCW8qQnY0xwB twDCTDD77wWgFzHFh/VnD5OwCbcBCc7D4OvmZ0nrdQrWMNr0AXq2/N2khzGkCyXDUQ+G BHoqV/XjbvfxRXmJQIB4ydFHBPSzX1DMQkUVGsYYUjOki+hyEy74Ln9SoFa81vAB8j7+ CiSQ== 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=k1xZFVLiBFjicuRZkER5p5qv43DfCK1C3WF78qOoWaE=; b=e2cF8iHt38twuBSEaVOP8fZ+H0mby0FvNS/yLpDaY2apChKZpVGug6VUU6+tDyrfEI Ii1AHj7HNPe3YU1D2JIAjZoRUR7PWb/F7MoWdbIiI6E1nzrzX6mPikwfQCWgYYgCa5kK 7+fdDovAZPRS+LMlDNDLs83DaYtZc8efdoBzXrsjkuJg32wrGtFu9Qb4p+mVWhLB7B9m OyyeohGHPicLsweDE5wlj/dYBumoYAZJYvSkkrgSIVqIhETdKJ+CXV6CIB2bTnDKsL+7 YrY5Zek3QXvah5gPWM0VwiIpf6YvGD4X9Bk7q8fd+O2ZRuHT1TBdnAC/tNL+j44nywTD 1u+Q== X-Gm-Message-State: APjAAAXPQBmtL/OTfTKy0WwF6h8wp4XeQIfqf9uhsNblWIROMJ4jBNWR smjPd5kN+7gApmL+B3YXhKbIbApl X-Google-Smtp-Source: APXvYqzxj36vpIZHBneA9wOVDkmKJiaDr6Bzu6DpBS0hG5Fwk+Hi4R1zqM1CrE+sBUU1U1c+uItKNA== X-Received: by 2002:a7b:c5da:: with SMTP id n26mr19580456wmk.60.1575194780228; Sun, 01 Dec 2019 02:06:20 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08e23.dynamic.kabel-deutschland.de. [188.192.142.35]) by smtp.gmail.com with ESMTPSA id n3sm3793063wmc.27.2019.12.01.02.06.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Dec 2019 02:06:19 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 1 Dec 2019 11:05:45 +0100 Message-Id: <20191201100546.16067-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191201100546.16067-1-andreas.rheinhardt@gmail.com> References: <20191201100546.16067-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] ffprobe, libavformat: Remove unnecessary initializations and reset 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" av_read_frame() can handle uninitialized input packets and it already returns clean packets on error. Signed-off-by: Andreas Rheinhardt --- fftools/ffprobe.c | 2 -- libavformat/hls.c | 1 - libavformat/mpegts.c | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index a95d74346d..a2956cca90 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -2356,8 +2356,6 @@ static int read_interval_packets(WriterContext *w, InputFile *ifile, int64_t start = -INT64_MAX, end = interval->end; int has_start = 0, has_end = interval->has_end && !interval->end_is_offset; - av_init_packet(&pkt); - av_log(NULL, AV_LOG_VERBOSE, "Processing read interval "); log_read_interval(interval, NULL, AV_LOG_VERBOSE); diff --git a/libavformat/hls.c b/libavformat/hls.c index f60396f246..a2d01c2165 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -2106,7 +2106,6 @@ static int hls_read_packet(AVFormatContext *s, AVPacket *pkt) if (ret < 0) { if (!avio_feof(&pls->pb) && ret != AVERROR_EOF) return ret; - reset_packet(&pls->pkt); break; } else { /* stream_index check prevents matching picture attachments etc. */ diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 587ed33327..864cae850d 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -3262,7 +3262,7 @@ static int64_t mpegts_get_dts(AVFormatContext *s, int stream_index, while(pos < pos_limit) { int ret; AVPacket pkt; - av_init_packet(&pkt); + ret = av_read_frame(s, &pkt); if (ret < 0) return AV_NOPTS_VALUE;