aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/asf.c
diff options
context:
space:
mode:
authorAnton Khirnov <wyskas@gmail.com>2010-02-01 11:39:10 +0000
committerPeter Ross <pross@xvid.org>2010-02-01 11:39:10 +0000
commitca76a11948eaffd2667efa247cff0eb13889c043 (patch)
tree3e666ab791907a103b6a5c9f85d7bb6195b0fe67 /libavformat/asf.c
parentb8bb398a40b1636de7a70131a45ddbc2944a242f (diff)
downloadffmpeg-ca76a11948eaffd2667efa247cff0eb13889c043.tar.gz
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
Diffstat (limited to 'libavformat/asf.c')
-rw-r--r--libavformat/asf.c8
1 files changed, 3 insertions, 5 deletions
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 }
};