From patchwork Fri Nov 13 14:58:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 23616 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 D830644B1E6 for ; Fri, 13 Nov 2020 16:59:52 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A945F68C269; Fri, 13 Nov 2020 16:59:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-2.mx.upcmail.net (vie01a-dmta-pe02-2.mx.upcmail.net [62.179.121.158]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DD86D68B9D9 for ; Fri, 13 Nov 2020 16:59:45 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1kdaY6-0007Lm-0H for ffmpeg-devel@ffmpeg.org; Fri, 13 Nov 2020 15:59:38 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id daX8kSgoqIr7GdaX8k2SMX; Fri, 13 Nov 2020 15:58:38 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=QN4WuTDL c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=2Jax1nxJU_cxa0phMOUA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 13 Nov 2020 15:58:38 +0100 Message-Id: <20201113145838.19187-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfLXPnxjLPs/nLtuSlshmYZDSsjPQyqNlyBoe6cvW88hS9ljSZ5lQ+VBYGSlw6IkKRDL30WNdfT3/V15P0kxIxcZsB/jN0gVkH1nS5sIEkZfoJIdtIM0a LqzSjikrRZ3ypmKmfzLxfGxJg7r6k2huC/Cw5PCPp3KhVonl+bTOE9/8 Subject: [FFmpeg-devel] [PATCH] avformat/avidec: Remove redundant entries from avi_metadata_conv 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Found-by: Anton Signed-off-by: Michael Niedermayer --- libavformat/avidec.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 7e527e15ee..0ab7348d74 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -111,13 +111,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 }, };