From patchwork Thu Nov 12 17:33:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23600 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 8879F449F10 for ; Thu, 12 Nov 2020 19:34:12 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7588268C19A; Thu, 12 Nov 2020 19:34:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 19E3768C18B for ; Thu, 12 Nov 2020 19:34:06 +0200 (EET) Received: by mail-wr1-f67.google.com with SMTP id c17so6848852wrc.11 for ; Thu, 12 Nov 2020 09:34:06 -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=m0TWfAFXyLyA9Z4eH0CSQc4XPAFCNtYy/PDbYhm8YfM=; b=SU/Ox99a8SjB0cZZLi2lyOacVpwfNEYGnlE6EFjqbtz7HQcjORvZHcmBD+jr0TC2/I H/GsinEj5pvrl8qSkn3vIrTbCkn/MCj2NOowtt8F2RYHyT5AGeDIfmbac+pTV/RTL+G7 S/1Js/bR8ZZ9+K9dbb3ATY2gyU22P/iZb0cMILZcp03zplBP7My6hJUvg7SsimJOs+Dh kyQTp9KZ2lM7gsyQeByZ3B/PKxLrshb5TOCoORqh1C7oa/5CZwmP97UY3HoGj8TqjiB3 mCo4zaaujNETMYYFVhJHecZ909waTaI1rd7gkcxAOXq4wNthNHj4n5YlrZO+xZDbKokS N5xA== 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=m0TWfAFXyLyA9Z4eH0CSQc4XPAFCNtYy/PDbYhm8YfM=; b=tX/1qa/Loz+q8gvgBvcoAoqYIZvBsvmzUiCFkI1rrglW8iZXKflYODmD36PQcbvatV 5PL/vl4YR4j1mYW22AullC/VUyUB2GxCYWmIni8njSS40KwHawDg6Bp5vlBl16zNn9/v yAuVuosTjO+iWwL77oupYxS3PjFyv3UnZevFaZm65clIb/ALzcT3nQ3Na7es9p8OXwz7 6ZmE4Pytm4faxI33RA7dj3jgFRe/vxxn3PcWb9bYNcn9cu2N0ji65feNrpege+1P3gbe M++DECS6igPezps9G0xq5hkEKy2xMYYIMw6yAG3yCYRNAv3kxvAiyBtHpJDv2lL1ncHk MP2Q== X-Gm-Message-State: AOAM533m1+7Tg2eoRSgBd1cYMgv7W+fB1JORKBt2FFAwa6Brv4TwRuS3 YSzFBcLufHfdoleNGI6lnEY9cn+fm3mXBg== X-Google-Smtp-Source: ABdhPJwJn9Phr43qANABj8lcENhtcgOqD/pdzYX0VJ0KW5pq7oG7hD4UkXBbgUGoRA9YMzevTR/FNw== X-Received: by 2002:adf:c452:: with SMTP id a18mr676035wrg.189.1605202437055; Thu, 12 Nov 2020 09:33:57 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id n15sm7814080wrq.48.2020.11.12.09.33.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Nov 2020 09:33:55 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Nov 2020 18:33:28 +0100 Message-Id: <20201112173328.742491-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201112173328.742491-1-andreas.rheinhardt@gmail.com> References: <20201112173328.742491-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] avformat/asfdec_o: Remove code duplication 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 --- libavformat/asfdec_o.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/libavformat/asfdec_o.c b/libavformat/asfdec_o.c index 9fd38f1bfe..655ba9f9ef 100644 --- a/libavformat/asfdec_o.c +++ b/libavformat/asfdec_o.c @@ -1542,14 +1542,7 @@ static void reset_packet_state(AVFormatContext *s) asf->sub_dts = 0; for (i = 0; i < asf->nb_streams; i++) { ASFPacket *pkt = &asf->asf_st[i]->pkt; - pkt->size_left = 0; - pkt->data_size = 0; - pkt->duration = 0; - pkt->flags = 0; - pkt->dts = 0; - pkt->duration = 0; - av_packet_unref(&pkt->avpkt); - av_init_packet(&pkt->avpkt); + reset_packet(pkt); } }