[FFmpeg-cvslog] r21841 - trunk/libavformat/asfenc.c

[cehoyos]

Author: cehoyos
Date: Mon Feb 15 22:19:40 2010
New Revision: 21841

Log:
Strings in extended content header are UTF16,
so terminating NULLs are 2 bytes long, not 1.

Patch by Anton Khirnov, wyskas gmail

Modified:
   trunk/libavformat/asfenc.c

Modified: trunk/libavformat/asfenc.c
==============================================================================
--- trunk/libavformat/asfenc.c	Mon Feb 15 22:14:47 2010	(r21840)
+++ trunk/libavformat/asfenc.c	Mon Feb 15 22:19:40 2010	(r21841)
@@ -352,13 +352,13 @@ static int asf_write_header1(AVFormatCon
         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) + 3) + 1);
+            put_le16(pb, 2*(strlen(tag->key) + 4));
             put_le16(pb, 'W');
             put_le16(pb, 'M');
             put_le16(pb, '/');
             put_str16_nolen(pb, tag->key);
             put_le16(pb, 0);
-            put_le16(pb, 2*strlen(tag->value) + 1);
+            put_le16(pb, 2*(strlen(tag->value) + 1));
             put_str16_nolen(pb, tag->value);
         }
         end_header(pb, hpos);