RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-30 03:12:08 +00:00
Code Issues Projects Releases Wiki Activity

Don't add WM prefixes to all written ASF tags.

Browse Source 
Patch by Anton Khirnov <wyskas gmail com>.

Originally committed as revision 22033 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Anton Khirnov 2010-02-24 18:17:32 +00:00 committed by Ronald S. Bultje
parent 855a1ba5e8
commit a106d4112d
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/asf.c
View File

@ -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 }
};

5
libavformat/asfenc.c
View File

@ -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));