diff options
| author | Anton Khirnov <wyskas@gmail.com> | 2010-02-24 18:17:32 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2010-02-24 18:17:32 +0000 |
| commit | a106d4112d4a4c437ee07679e6d165356e316a87 (patch) | |
| tree | 76980d429332b55c8cfa642d33093b58df839737 /libavformat | |
| parent | 855a1ba5e8a477cc07f6d804a95f2ba9c74dec8c (diff) | |
| download | ffmpeg-a106d4112d4a4c437ee07679e6d165356e316a87.tar.gz | |
Don't add WM prefixes to all written ASF tags.
Patch by Anton Khirnov <wyskas gmail com>.
Originally committed as revision 22033 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/asf.c | 6 | ||||
| -rw-r--r-- | libavformat/asfenc.c | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/libavformat/asf.c b/libavformat/asf.c index e8b37d4268..484a58defe 100644 --- a/libavformat/asf.c +++ b/libavformat/asf.c @@ -129,10 +129,10 @@ const ff_asf_guid ff_asf_digital_signature = { }; const AVMetadataConv ff_asf_metadata_conv[] = { - { "AlbumArtist", "album_artist"}, - { "AlbumTitle" , "album" }, + { "WM/AlbumArtist", "album_artist"}, + { "WM/AlbumTitle" , "album" }, { "Author" , "artist" }, - { "TrackNumber", "track" }, + { "WM/TrackNumber", "track" }, // { "Year" , "date" }, TODO: conversion year<->date { 0 } }; diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c index b24baafdec..5f584a288c 100644 --- a/libavformat/asfenc.c +++ b/libavformat/asfenc.c @@ -345,10 +345,7 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data hpos = put_header(pb, &ff_asf_extended_content_header); put_le16(pb, metadata_count); while ((tag = av_metadata_get(s->metadata, "", tag, AV_METADATA_IGNORE_SUFFIX))) { - put_le16(pb, 2*(strlen(tag->key) + 4)); - put_le16(pb, 'W'); - put_le16(pb, 'M'); - put_le16(pb, '/'); + put_le16(pb, 2*(strlen(tag->key) + 1)); put_str16_nolen(pb, tag->key); put_le16(pb, 0); put_le16(pb, 2*(strlen(tag->value) + 1)); |