Mercurial > libavformat.hg

changeset 5714:081abaf38c51 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't add WM prefixes to all written ASF tags. Patch by Anton Khirnov <wyskas gmail com>.
author rbultje
date Wed, 24 Feb 2010 18:17:32 +0000
parents 0db115a3dbb4
children ead2df871971
files asf.c asfenc.c
diffstat 2 files changed, 4 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/asf.c	Wed Feb 24 18:09:49 2010 +0000
+++ b/asf.c	Wed Feb 24 18:17:32 2010 +0000
@@ -129,10 +129,10 @@
 };
 
 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 }
 };
--- a/asfenc.c	Wed Feb 24 18:09:49 2010 +0000
+++ b/asfenc.c	Wed Feb 24 18:17:32 2010 +0000
@@ -345,10 +345,7 @@
         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));