From patchwork Thu Nov 12 17:33:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23597 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 DC7CB44979A for ; Thu, 12 Nov 2020 19:33:45 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AA18568C188; Thu, 12 Nov 2020 19:33:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A4A0668C142 for ; Thu, 12 Nov 2020 19:33:39 +0200 (EET) Received: by mail-wm1-f67.google.com with SMTP id w24so6278109wmi.0 for ; Thu, 12 Nov 2020 09:33:39 -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:mime-version :content-transfer-encoding; bh=dEWEkSkVrC28IdDnbRIhwoFDiLgHomQ7fqJeGdY4Nzk=; b=cszyq1AuPsXBKm0Ofrg8jirpqbdvKQXqPzxl61G2EVNQZoDIf+0EgwwS51uZcUungc 515gw1IwIGhN82jCpTdl+wT/GfuQ8ag+flL5IM1ym5K1QXpkPJ34xtaDvB4KQSKXtMP4 mSwdPBxHpuhfOwH8KujsP/F03GB2EJ6yKIKPL6+Uh7S5YGZ6ZguwZP9Vklg56QWVEnJy EqkPpmGDqYYiQ4QW+3fH3sUWVDWfPTD20hY/fbL7h/sOJOjD9tjszJqmMbMcIvMRX6sB Vb6nfA3M90dQzEMjxsudgT377YXKIvhp5YJvK7jDIBWTWhUAVSkSaUIkldIcDPJbNhQZ szSg== 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:mime-version :content-transfer-encoding; bh=dEWEkSkVrC28IdDnbRIhwoFDiLgHomQ7fqJeGdY4Nzk=; b=VEAwXAlWyKeKzCEocRx46PJJSDvwekESYZCNTvef6x9tpAWMCOgaM517vR/Hg9U26Z m5fSNqAYaywhzVnIeM4gKV/hlDJxHEnZq41skLwQaOGy0sAv7Ym3EY5AGXJ6ouZqkc9Z HjP+PzrgJlZpqoazHCv0Q4NF4lPrxqfn2vbHxu+cAmzN578Jjtcj8CnpmnggmHFDytep Ys5D230kJ6BA+4Z7Sp32MFdcP5KJc93cLk7wLdduglooJmWTb6SPItEMXt0sF7L3CJ5s HJ00Hqa+Y1vmE/9YjGf3V8wQtkKtZKOXer6vFFNtfqLn/Un/NgDkxZBN3VuRivB+tqqL cppg== X-Gm-Message-State: AOAM532NO5i0lsRmgg24GA+zC2UrOtHg4wyCb0GkKjmWcCP0iUSneTBB fw41zrB0fTh1Its2ILYTOQbiBPL/+/j15Q== X-Google-Smtp-Source: ABdhPJyMlmU/XSWFHLaJpvCbwr9cIszU4wSidj+0W+tqPkVZ480jwk7JhXKq+LNcdFTW1ybUFwCgGg== X-Received: by 2002:a1c:80cb:: with SMTP id b194mr716153wmd.73.1605202418827; Thu, 12 Nov 2020 09:33:38 -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.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Nov 2020 09:33:38 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Nov 2020 18:33:25 +0100 Message-Id: <20201112173328.742491-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] avformat/asfdec_o: Don't segfault with lots of attached pics 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" The ASF file format has a limit of 127 streams and the "asf_o" demuxer (the ASF demuxer from Libav) has an array of pointers for a structure called ASFStream that is allocated on demand for every stream. Attached pictures are not streams in the sense of the ASF specification, yet the demuxer created an ASFStream for them; and in one codepath it also forgot to check whether the array of ASFStreams is already full. The result is a write beyond the end of the array and a segfault lateron. Fixing this is easy: Don't create ASFStreams for attached picture streams. (Other results of the current state of affairs are unnecessary allocations (of ASFStreams structures), the misparsing of valid files (there might not be enough ASFStreams left for the valid streams if attached pictures take up too many); furthermore, the ASFStreams created for attached pictures all have the stream number 0, an invalid stream number (the valid range is 1-127). This means that invalid data (packets for a stream with stream number 0) won't get rejected lateron.) Signed-off-by: Andreas Rheinhardt --- libavformat/asfdec_o.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/libavformat/asfdec_o.c b/libavformat/asfdec_o.c index b142f83541..0a7e47d8cc 100644 --- a/libavformat/asfdec_o.c +++ b/libavformat/asfdec_o.c @@ -357,7 +357,6 @@ static int asf_set_metadata(AVFormatContext *s, const uint8_t *name, * but in reality this is only loosely similar */ static int asf_read_picture(AVFormatContext *s, int len) { - ASFContext *asf = s->priv_data; AVPacket pkt = { 0 }; const CodecMime *mime = ff_id3v2_mime_tags; enum AVCodecID id = AV_CODEC_ID_NONE; @@ -365,7 +364,6 @@ static int asf_read_picture(AVFormatContext *s, int len) uint8_t *desc = NULL; AVStream *st = NULL; int ret, type, picsize, desc_len; - ASFStream *asf_st; /* type + picsize + mime + desc */ if (len < 1 + 4 + 2 + 2) { @@ -422,22 +420,14 @@ static int asf_read_picture(AVFormatContext *s, int len) ret = AVERROR(ENOMEM); goto fail; } - asf->asf_st[asf->nb_streams] = av_mallocz(sizeof(*asf_st)); - asf_st = asf->asf_st[asf->nb_streams]; - if (!asf_st) { - ret = AVERROR(ENOMEM); - goto fail; - } st->disposition |= AV_DISPOSITION_ATTACHED_PIC; - st->codecpar->codec_type = asf_st->type = AVMEDIA_TYPE_VIDEO; + st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; st->codecpar->codec_id = id; st->attached_pic = pkt; - st->attached_pic.stream_index = asf_st->index = st->index; + st->attached_pic.stream_index = st->index; st->attached_pic.flags |= AV_PKT_FLAG_KEY; - asf->nb_streams++; - if (*desc) { if (av_dict_set(&st->metadata, "title", desc, AV_DICT_DONT_STRDUP_VAL) < 0) av_log(s, AV_LOG_WARNING, "av_dict_set failed.\n"); From patchwork Thu Nov 12 17:33: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: 23598 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 1BDAD44979A for ; Thu, 12 Nov 2020 19:34:02 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0546C68C18F; Thu, 12 Nov 2020 19:34:02 +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 2D46868C176 for ; Thu, 12 Nov 2020 19:33:55 +0200 (EET) Received: by mail-wr1-f67.google.com with SMTP id o15so6883065wru.6 for ; Thu, 12 Nov 2020 09:33:55 -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=S7gkl4sSYyQpHOe9ABZuTf6tJs3Odls8tzGbOQjgyaE=; b=ZYBig7jINGwneSVZUYZE/kIRxwsHRs4uHUBhZBWDqkhO0RE1nKEoRSVOjshcUTl7ei cKw81poE8xTQR/M1ZiDJy3y5RjzpcdzHiz5H2Rc73DULal38FQhn/urUpOZxYAVEiy0C zf9y4KXvUNJRZtEaL5OR6Ju06kJijG+8/vtO6kdcumEkYw+qv+NQWEGnrPy/673sCniW wjZDRuaGADNxdepAjn7JyDj02aE4hltj3B5X2FPyfMRLo5cF/JsPHEH+CfnVHw6G5i2i VwMSSrTx/MjIgzQcCxV8AbyJKaaeyqjgMEsViuobOMnwxGN3mlHSvgC/+eDtXBRJ8Qvh jojw== 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=S7gkl4sSYyQpHOe9ABZuTf6tJs3Odls8tzGbOQjgyaE=; b=j3rKOg6posODppCRqdpgzt6+gk+/Gkn6qQ9d8dMlGWv+i2241bNobp1c7kMhz23avb /XGo8vfgmqmsY8IQGohbJCjrwnXQ+hBUYiXQDzq4NbyhAy8lcSeOtFH1hLgxmisoOqcR yvbLAN8rp3UXZ3YDzgKa31pV/Krpyfbk+6kLzz3jpQQ0gAfwKYC6eTFOuulTOhUy8CCt Wi2cGtTrLAbZ0mt+k4YaUGJdEuvc0MVQ2BMto1j7fibX8kR6KmwIDhSo2fL+i2c3pSKy OG7jCIpMfwUOXQ9JvwV/R7O17QBSgnEzfSBTxjxqTOVpDhQ8YJ382RS06gcZKkUJYuKl WiPg== X-Gm-Message-State: AOAM533auYr3Z2rfexTtWdegON2xh72PpjTaKsIQn0J9L/B1hyocHoDL tf7AWKK3wvUyeF8aFT+eWJpZgolC4RRRLw== X-Google-Smtp-Source: ABdhPJw6efDOQYLrSkkS4gHr3vH/NtsBuceSMvPAVaW27GgDNAHky60OJiP6uLnMtmF0md1hLNPc6Q== X-Received: by 2002:adf:eb47:: with SMTP id u7mr658626wrn.163.1605202434380; Thu, 12 Nov 2020 09:33:54 -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.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Nov 2020 09:33:53 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Nov 2020 18:33:26 +0100 Message-Id: <20201112173328.742491-2-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 2/4] avcodec/asfdec_o: Export metadata that applies to the whole file 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" The ASF specification of Metadata Objects' stream number is as follows: "Specifies whether the entry applies to a specific digital media stream or whether it applies to the whole file. A value of 0 in this field indicates that it applies to the whole file; otherwise, the entry applies only to the indicated stream number and must be between 1 and 127." Yet the asf_o demuxer (the one originating from Libav) has always treated such metadata as if it applied to a stream even though no stream with a stream number may exist in a valid ASF file. This is fixed in this commit; it affected e.g. the file wma_with_metadata_library_object_tag_trimmed.wma from the FATE suite. Signed-off-by: Andreas Rheinhardt --- The other ASF demuxer btw applies all per-stream metadata to the whole file. libavformat/asfdec_o.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/asfdec_o.c b/libavformat/asfdec_o.c index 0a7e47d8cc..2dcbc16332 100644 --- a/libavformat/asfdec_o.c +++ b/libavformat/asfdec_o.c @@ -596,7 +596,8 @@ static int asf_read_metadata_obj(AVFormatContext *s, const GUIDParseTable *g) } else { if (st_num < ASF_MAX_STREAMS) { if ((ret = process_metadata(s, name, name_len, val_len, type, - &asf->asf_sd[st_num].asf_met)) < 0) { + st_num ? &asf->asf_sd[st_num].asf_met + : &s->metadata)) < 0) { av_freep(&name); break; } From patchwork Thu Nov 12 17:33:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23599 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 403BF44979A for ; Thu, 12 Nov 2020 19:34:03 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 285F768C192; Thu, 12 Nov 2020 19:34:03 +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 12DC968C191 for ; Thu, 12 Nov 2020 19:33:56 +0200 (EET) Received: by mail-wr1-f66.google.com with SMTP id p1so6854641wrf.12 for ; Thu, 12 Nov 2020 09:33:56 -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=3ForpxFMmY8zFo01A4VW9cxR/96fXr50pNQSKzlE3Ik=; b=auViNNSVuvV14kvJpsd1eHfbUxpItgSK6pmpWEMjB31OLn5tBpDWXc4xunD1wS+szu 2J2i7CQgzsvHwz34m+xOQVzrR/XZBwpypu+jsfBatx14R7swdMqX+/NEFigxd1Dl+q+w qwsQXxQ9YISjxolNUwCJD6o9T1fXUK8tdFEqElmeKekDH8vxh1VOnecZRMD7Fdk7AZJN jc02WOvyRC4RCdrd9lbDfz/U2rARiGkfWsILbM+d/Hq64zf0FCeLyPak9z6fn8pcdJEc lJXn+TgxI9UTj/jpfqzCQ6TDxH5aO4B7rLap9xzc6i6XOYbQkRI/A8iSxBNPQsanmCHI K+Iw== 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=3ForpxFMmY8zFo01A4VW9cxR/96fXr50pNQSKzlE3Ik=; b=I8eYIWymKa4jWPIS+ciwDMp9/UWfgaecV3ACpS0Smnq9Zzs1p+7Cw59/7uPY6YkMfg 4wkveBXoK7RtsRLaI6BfmYlUNa971XSqP/iZBDY14+SJPgT2oNuMgpjQFd1rhhXjWqV9 kVZJYI88EtzQNKZa4ZP440yjQFc4oX6KnOZ4tDl6eXOPsNJTo5dXDFjvCFhW/hkRE4pj S+5W4+nbTsz53lMZjA/Uz7OsTcEZc67zoiOr4QPdey+JP8M68OWiY9BNiNS4gO7JwJHf ePOIuDIBtx9GectCjy6hiCMdPr5hMv6Jry6//cKaGPZoTyucA+1tKskYT6rwmdkJP8w1 mnJg== X-Gm-Message-State: AOAM532d1bg5LH6Y1Uc0hzHA7/GqHEBPEczvy5HJpaxLitBT/zKkuwLV h5TnIWv9GOTdrICGPojKjMzoFr7BzpjezQ== X-Google-Smtp-Source: ABdhPJxom0l0bWKBbevmVyfr2nwA+GUSVUHG0si36wzEIK/x70i2O0/4YqnI0ZKUjeuafjjX0ncqoQ== X-Received: by 2002:adf:f7c7:: with SMTP id a7mr685862wrq.347.1605202435251; Thu, 12 Nov 2020 09:33:55 -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.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Nov 2020 09:33:54 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Nov 2020 18:33:27 +0100 Message-Id: <20201112173328.742491-3-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 3/4] avformat/asfdec_o: Don't reset twice 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" A variable has been assigned a value twice consecutively; essentially the same happens when one performs av_init_packet on an AVPacket after a call to av_packet_unref. Found via PVS-Studio (see ticket #8156). Signed-off-by: Andreas Rheinhardt --- This and the next one are old commits that are recycled. libavformat/asfdec_o.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavformat/asfdec_o.c b/libavformat/asfdec_o.c index 2dcbc16332..9fd38f1bfe 100644 --- a/libavformat/asfdec_o.c +++ b/libavformat/asfdec_o.c @@ -1135,9 +1135,7 @@ static void reset_packet(ASFPacket *asf_pkt) asf_pkt->duration = 0; asf_pkt->flags = 0; asf_pkt->dts = 0; - asf_pkt->duration = 0; av_packet_unref(&asf_pkt->avpkt); - av_init_packet(&asf_pkt->avpkt); } static int asf_read_replicated_data(AVFormatContext *s, ASFPacket *asf_pkt) 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); } }