From ca76a11948eaffd2667efa247cff0eb13889c043 Mon Sep 17 00:00:00 2001
From: Anton Khirnov
Date: Mon, 1 Feb 2010 11:39:10 +0000
Subject: Add a list of generic tags and change demuxers to follow it. Patch by
 Anton Khirnov, wyskas at gmail dot com

Originally committed as revision 21587 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavformat/asf.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'libavformat/asf.c')

diff --git a/libavformat/asf.c b/libavformat/asf.c
index cf01e07326..e8b37d4268 100644
--- a/libavformat/asf.c
+++ b/libavformat/asf.c
@@ -129,12 +129,10 @@ const ff_asf_guid ff_asf_digital_signature = {
 };
 
 const AVMetadataConv ff_asf_metadata_conv[] = {
-    { "AlbumArtist", "artist"    },
+    { "AlbumArtist", "album_artist"},
     { "AlbumTitle" , "album"     },
-    { "Author"     , "author"    },
-    { "Genre"      , "genre"     },
-    { "Copyright"  , "copyright" },
+    { "Author"     , "artist"    },
     { "TrackNumber", "track"     },
-    { "Year"       , "year"      },
+//  { "Year"       , "date"      }, TODO: conversion year<->date
     { 0 }
 };
-- 
cgit v1.2.3