aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorBenoit Fouet <benoit.fouet@free.fr>2010-02-25 09:09:39 +0000
committerBenoit Fouet <benoit.fouet@free.fr>2010-02-25 09:09:39 +0000
commit9b54f4328ee67d5e8960f688857c8b76ce4dc07a (patch)
tree5bd2017cd1c533abff328572846209949fda344e /libavformat
parente1c88a2138c2bb1f79f5b97b86fac8664f1c5bc7 (diff)
downloadffmpeg-9b54f4328ee67d5e8960f688857c8b76ce4dc07a.tar.gz
asf: add more entries to metadata conv table.
Patch from Anton Khirnov wyskas gmail com Originally committed as revision 22049 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/asf.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/libavformat/asf.c b/libavformat/asf.c
index 484a58defe..48948f8cfc 100644
--- a/libavformat/asf.c
+++ b/libavformat/asf.c
@@ -128,11 +128,23 @@ const ff_asf_guid ff_asf_digital_signature = {
0xfc, 0xb3, 0x11, 0x22, 0x23, 0xbd, 0xd2, 0x11, 0xb4, 0xb7, 0x00, 0xa0, 0xc9, 0x55, 0xfc, 0x6e
};
+/* List of official tags at http://msdn.microsoft.com/en-us/library/dd743066(VS.85).aspx */
const AVMetadataConv ff_asf_metadata_conv[] = {
{ "WM/AlbumArtist", "album_artist"},
{ "WM/AlbumTitle" , "album" },
{ "Author" , "artist" },
+ { "Description" , "comment" },
+ { "WM/Composer" , "composer" },
+ { "WM/EncodedBy" , "encoded_by" },
+ { "WM/EncodingSettings", "encoder" },
+ { "WM/Genre" , "genre" },
+ { "WM/Language" , "language" },
+ { "WM/OriginalFilename", "filename" },
+ { "WM/PartOfSet" , "disc" },
+ { "WM/Publisher" , "publisher" },
+ { "WM/Tool" , "encoder" },
{ "WM/TrackNumber", "track" },
+ { "WM/Track" , "track" },
// { "Year" , "date" }, TODO: conversion year<->date
{ 0 }
};