| Index: source/patched-ffmpeg-mt/libavformat/vorbiscomment.c | 
| =================================================================== | 
| --- source/patched-ffmpeg-mt/libavformat/vorbiscomment.c	(revision 65184) | 
| +++ source/patched-ffmpeg-mt/libavformat/vorbiscomment.c	(working copy) | 
| @@ -52,15 +52,16 @@ | 
| return len; | 
| } | 
|  | 
| -int ff_vorbiscomment_write(uint8_t **p, AVMetadata *m, | 
| +int ff_vorbiscomment_write(uint8_t **p, AVMetadata **m, | 
| const char *vendor_string, const unsigned count) | 
| { | 
| +    ff_metadata_conv(m, ff_vorbiscomment_metadata_conv, NULL); | 
| bytestream_put_le32(p, strlen(vendor_string)); | 
| bytestream_put_buffer(p, vendor_string, strlen(vendor_string)); | 
| -    if (m) { | 
| +    if (*m) { | 
| AVMetadataTag *tag = NULL; | 
| bytestream_put_le32(p, count); | 
| -        while ((tag = av_metadata_get(m, "", tag, AV_METADATA_IGNORE_SUFFIX))) { | 
| +        while ((tag = av_metadata_get(*m, "", tag, AV_METADATA_IGNORE_SUFFIX))) { | 
| unsigned int len1 = strlen(tag->key); | 
| unsigned int len2 = strlen(tag->value); | 
| bytestream_put_le32(p, len1+1+len2); | 
|  |