diff options
| author | Anton Khirnov <wyskas@gmail.com> | 2010-02-01 11:39:10 +0000 |
|---|---|---|
| committer | Peter Ross <pross@xvid.org> | 2010-02-01 11:39:10 +0000 |
| commit | ca76a11948eaffd2667efa247cff0eb13889c043 (patch) | |
| tree | 3e666ab791907a103b6a5c9f85d7bb6195b0fe67 /libavformat/id3v2.c | |
| parent | b8bb398a40b1636de7a70131a45ddbc2944a242f (diff) | |
| download | ffmpeg-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/id3v2.c')
| -rw-r--r-- | libavformat/id3v2.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index 7cf3b22215..f007a3c5d7 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -240,20 +240,26 @@ const AVMetadataConv ff_id3v2_metadata_conv[] = { { "TCO", "genre"}, { "TCOP", "copyright"}, { "TDRL", "date"}, - { "TENC", "encoder"}, - { "TEN", "encoder"}, + { "TDRC", "date"}, + { "TENC", "encoded_by"}, + { "TEN", "encoded_by"}, { "TIT2", "title"}, { "TT2", "title"}, { "TLAN", "language"}, { "TPE1", "artist"}, { "TP1", "artist"}, + { "TPE2", "album_artist"}, + { "TP2", "album_artist"}, + { "TPE3", "performer"}, + { "TP3", "performer"}, { "TPOS", "disc"}, { "TPUB", "publisher"}, { "TRCK", "track"}, { "TRK", "track"}, - { "TSOA", "albumsort"}, - { "TSOP", "authorsort"}, - { "TSOT", "titlesort"}, + { "TSOA", "album-sort"}, + { "TSOP", "artist-sort"}, + { "TSOT", "title-sort"}, + { "TSSE", "encoder"}, { 0 } }; |