summaryrefslogtreecommitdiff
path: root/libavformat/matroska.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/matroska.c
parentb8bb398a40b1636de7a70131a45ddbc2944a242f (diff)
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/matroska.c')
-rw-r--r--libavformat/matroska.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavformat/matroska.c b/libavformat/matroska.c
index f208e329be..1e74d2ba39 100644
--- a/libavformat/matroska.c
+++ b/libavformat/matroska.c
@@ -93,8 +93,7 @@ const CodecMime ff_mkv_mime_tags[] = {
};
const AVMetadataConv ff_mkv_metadata_conv[] = {
- { "ARTIST" , "artist" },
- { "LEAD_PERFORMER", "artist" },
+ { "LEAD_PERFORMER", "performer" },
{ "PART_NUMBER" , "track" },
{ 0 }
};