From patchwork Sun Jul 21 14:31:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 14021 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 EFFBE448C11 for ; Sun, 21 Jul 2019 17:55:54 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A8A7668A363; Sun, 21 Jul 2019 17:55:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f193.google.com (mail-oi1-f193.google.com [209.85.167.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 58BC668A362 for ; Sun, 21 Jul 2019 17:55:48 +0300 (EEST) Received: by mail-oi1-f193.google.com with SMTP id 65so27761509oid.13 for ; Sun, 21 Jul 2019 07:55:48 -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; bh=sM6EBSQWZHGEitvOpGAdlgii+WTpFMQoR7YGtE9Vyjs=; b=IbyWyfgNHKMN1K6zG+ORi2ePL0gcus8mtJa3EKtAOcarxNeDkO/5O+5dp8ZQSxF2Z+ aocK2/9whMdyhqlmTZYPuwShQEysKTrZM9TGT7rai1DWu67uzXOXTZPZBI/V7HumDNcO kVdrUipqRbJt8DSQywD/ZRBW3jQ0df7LnBpJaZ5eCtUW1SJzFlC+JPo9b8af9iaCCkvh PwO3Z8RyDrvLCbOzvxV7K72CCXLNKZ8/gqiyRuLSdSIOqWXd0YXGJO7o7DuTFOFPuCc2 vGQCDmbZS/cUjjvMty/FPSqVrhT3eq8mDuSCfPy1AODDX3GJNvcAX2GdPeFu4SWG34o+ p6qg== 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; bh=sM6EBSQWZHGEitvOpGAdlgii+WTpFMQoR7YGtE9Vyjs=; b=mU/4ypgpEXC+VSnnUGL3PLI2OHrocF38+U1eRAdpXrHWJSXNe5zsYvZdyR/xQQBf17 18YXwq/zexohVZs7rl6Iq6yH4+YGl4NjL9k8nz02mS6y6OzOO2RPZTh/5F44TZ819eqS fpO1skGs/c3u2zwGyOZOjUKbkfDEQIxdcGjQjD23C8AMcid7el15GseptE6vXbYSxFLz d01m0JItNq/nSSdPP4PkyU+5ycYpfarDbtZgCbT8LP+NvF3vwxYorSh1mzxl8kJDs6LF 7IF1H6D9OelZHBtnJk2T2X+TJv13Bg6YDkmx83MTm33Ru3/etYb2Cl6JXx9eGa7v9pkq C5yQ== X-Gm-Message-State: APjAAAXiFkRmPfduPbRc+QRGvYCgKwh3ItnKz/jB5Zls1kP+ifD4Rrhj r9RGszBvK51KE7hF5hruQHdSiOCz X-Google-Smtp-Source: APXvYqwwUi6gpRvAhXWkO30jIJkAdeUsprPy3KPzXJDWUKeJ8QfXsDAa3sidBi6j1WcscU4+Nm9PeA== X-Received: by 2002:a63:c013:: with SMTP id h19mr36511406pgg.108.1563719503452; Sun, 21 Jul 2019 07:31:43 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id w18sm46148194pfj.37.2019.07.21.07.31.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 21 Jul 2019 07:31:42 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sun, 21 Jul 2019 22:31:35 +0800 Message-Id: <1563719497-3780-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 Subject: [FFmpeg-devel] [PATCH V1 1/3] lavf/hls: remove redundancy reset_packet() after av_packet_unref() 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao av_packet_unref have reseted the AVPacket, so don't need to call reset_packet after that. Signed-off-by: Jun Zhao --- libavformat/hls.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index 8c12fce..238ebd0 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -2120,7 +2120,6 @@ static int hls_read_packet(AVFormatContext *s, AVPacket *pkt) } } av_packet_unref(&pls->pkt); - reset_packet(&pls->pkt); } } /* Check if this stream has the packet with the lowest dts */ @@ -2149,7 +2148,6 @@ static int hls_read_packet(AVFormatContext *s, AVPacket *pkt) ret = update_streams_from_subdemuxer(s, pls); if (ret < 0) { av_packet_unref(&pls->pkt); - reset_packet(&pls->pkt); return ret; } @@ -2174,7 +2172,6 @@ static int hls_read_packet(AVFormatContext *s, AVPacket *pkt) av_log(s, AV_LOG_ERROR, "stream index inconsistency: index %d, %d main streams, %d subdemuxer streams\n", pls->pkt.stream_index, pls->n_main_streams, pls->ctx->nb_streams); av_packet_unref(&pls->pkt); - reset_packet(&pls->pkt); return AVERROR_BUG; } @@ -2262,7 +2259,6 @@ static int hls_read_seek(AVFormatContext *s, int stream_index, ff_format_io_close(pls->parent, &pls->input_next); pls->input_next_requested = 0; av_packet_unref(&pls->pkt); - reset_packet(&pls->pkt); pls->pb.eof_reached = 0; /* Clear any buffered data */ pls->pb.buf_end = pls->pb.buf_ptr = pls->pb.buffer;