Commit a106d411 authored by Anton Khirnov's avatar Anton Khirnov Committed by Ronald S. Bultje

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
parent 855a1ba5
...@@ -129,10 +129,10 @@ const ff_asf_guid ff_asf_digital_signature = { ...@@ -129,10 +129,10 @@ const ff_asf_guid ff_asf_digital_signature = {
}; };
const AVMetadataConv ff_asf_metadata_conv[] = { const AVMetadataConv ff_asf_metadata_conv[] = {
{ "AlbumArtist", "album_artist"}, { "WM/AlbumArtist", "album_artist"},
{ "AlbumTitle" , "album" }, { "WM/AlbumTitle" , "album" },
{ "Author" , "artist" }, { "Author" , "artist" },
{ "TrackNumber", "track" }, { "WM/TrackNumber", "track" },
// { "Year" , "date" }, TODO: conversion year<->date // { "Year" , "date" }, TODO: conversion year<->date
{ 0 } { 0 }
}; };
...@@ -345,10 +345,7 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data ...@@ -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); hpos = put_header(pb, &ff_asf_extended_content_header);
put_le16(pb, metadata_count); put_le16(pb, metadata_count);
while ((tag = av_metadata_get(s->metadata, "", tag, AV_METADATA_IGNORE_SUFFIX))) { while ((tag = av_metadata_get(s->metadata, "", tag, AV_METADATA_IGNORE_SUFFIX))) {
put_le16(pb, 2*(strlen(tag->key) + 4)); put_le16(pb, 2*(strlen(tag->key) + 1));
put_le16(pb, 'W');
put_le16(pb, 'M');
put_le16(pb, '/');
put_str16_nolen(pb, tag->key); put_str16_nolen(pb, tag->key);
put_le16(pb, 0); put_le16(pb, 0);
put_le16(pb, 2*(strlen(tag->value) + 1)); put_le16(pb, 2*(strlen(tag->value) + 1));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment