From patchwork Mon Nov 23 18:54:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Foucu X-Patchwork-Id: 23975 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 30E01449E76 for ; Mon, 23 Nov 2020 21:00:40 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 083FB68BB5E; Mon, 23 Nov 2020 21:00:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A493E68BB27 for ; Mon, 23 Nov 2020 21:00:32 +0200 (EET) Received: by mail-pl1-f172.google.com with SMTP id l1so1060678pld.5 for ; Mon, 23 Nov 2020 11:00:32 -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=a2ALoY5z1I5kx0mZpGoMiIrLfWCAXT55xr/FqLy3Uf4=; b=s0qZvCS17bvaOVr0k3qhGtD3N7XM8hu4o44XHb5/mO3BszT4OvJkX9y9Hb+hMggke+ xkj3P1ny3pMfAktEhBD4bWjhNOzKE0c8alNqi0I6I22aThnVf9ctN2w5UF43us+TUg/X aOEvd5r3CG4VJmEt0AYxrHeuOg5z/Aj1/Gfyp4wCjDDGYcxe82vi1aiAkF/AJCQAlMau PAdveS21voA233L/XX3RfaNG1ajvfQI5K4hNJWwGJDFxldTyTUdJf6oVH5SWDyvQ8JY8 3D5+shsJ7Al2dp6h9vaemBOpJt5up2EbY+x+nEtypB1W0vM51JosKG6rWefZ7KlMXLOY MZug== 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=a2ALoY5z1I5kx0mZpGoMiIrLfWCAXT55xr/FqLy3Uf4=; b=ioXaEtMeCWgReht8RPN7OPUFUyxu6er6BQfV+OKa0dF2lTy451KA/ybj0yPhzqDhpH E/B/LfvLZ8/6h8YEkPswAcYB4HaivQQJ0BROSdcD1735kQmXWIhAztI4vwOygoEYCCfP CCzkPLOMpPOtfxlWEXqnMquJPzPLeenYyP7YGFBPWBtI6lOpC9G5oviGBgj+SGut2Jsj mixR4h5MSveGhws31JeticqCiqBKt9QhJrDVQZVfN2/UZzMpRC4iIuNk/ZiItr8P3ivU i8xkKb8H1WgBUzef9+YMocjqbjtSTE23q6snFFS93XEEO2UA/cAJUe5UL+M/Hi+nJevr By3g== X-Gm-Message-State: AOAM53070ojKdAph0YaWkcUJm08aKJ1XIcH4E6Y1b581Mn99YDxQpagz 5J44mWJDGJLUHYbQ6F4+I7YjHFY8zHY= X-Google-Smtp-Source: ABdhPJwgM2mBgAqbGEe9LEKm6P/6zsWuzugc0xKaqxde9TC2xyiee/k4nTvTT4wieQpkYUcBXVhu7g== X-Received: by 2002:a17:902:b582:b029:d6:6008:264d with SMTP id a2-20020a170902b582b02900d66008264dmr701389pls.80.1606157702060; Mon, 23 Nov 2020 10:55:02 -0800 (PST) Received: from tfoucu.mtv.corp.google.com ([2620:0:1000:4001:a28c:fdff:feed:4b81]) by smtp.gmail.com with ESMTPSA id v23sm12497480pfn.141.2020.11.23.10.55.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Nov 2020 10:55:01 -0800 (PST) From: Thierry Foucu To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Nov 2020 10:54:58 -0800 Message-Id: <20201123185458.3716975-1-tfoucu@gmail.com> X-Mailer: git-send-email 2.29.2.454.gaff20da3a2-goog MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavformat/avidec.c: remove duplicated conversion 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: Thierry Foucu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" ff_riff_info_conv deals with riff metadata already, so, not need to add those metadata in avi_metadata_conv --- libavformat/avidec.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 7e527e15ee..75a76b995d 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -110,14 +110,6 @@ static const char avi_headers[][8] = { static const AVMetadataConv avi_metadata_conv[] = { { "strn", "title" }, - { "isbj", "subject" }, - { "inam", "title" }, - { "iart", "artist" }, - { "icop", "copyright" }, - { "icmt", "comment" }, - { "ignr", "genre" }, - { "iprd", "product" }, - { "isft", "software" }, { 0 }, };