| Index: source/patched-ffmpeg-mt/libavformat/mp3.c | 
| =================================================================== | 
| --- source/patched-ffmpeg-mt/libavformat/mp3.c	(revision 65184) | 
| +++ source/patched-ffmpeg-mt/libavformat/mp3.c	(working copy) | 
| @@ -195,7 +195,6 @@ | 
| mp3_read_packet, | 
| .flags= AVFMT_GENERIC_INDEX, | 
| .extensions = "mp2,mp3,m2a", /* XXX: use probe */ | 
| -    .metadata_conv = ff_id3v2_metadata_conv, | 
| }; | 
| #endif | 
|  | 
| @@ -294,7 +293,6 @@ | 
| NULL, | 
| mp3_write_packet, | 
| mp3_write_trailer, | 
| -    .metadata_conv = ff_id3v2_metadata_conv, | 
| }; | 
| #endif | 
|  | 
| @@ -317,6 +315,7 @@ | 
| size_pos = url_ftell(s->pb); | 
| put_be32(s->pb, 0); | 
|  | 
| +    ff_metadata_conv(&s->metadata, ff_id3v2_metadata_conv, NULL); | 
| while ((t = av_metadata_get(s->metadata, "", t, AV_METADATA_IGNORE_SUFFIX))) { | 
| uint32_t tag = 0; | 
|  | 
| @@ -366,6 +365,5 @@ | 
| mp3_write_packet, | 
| mp3_write_trailer, | 
| AVFMT_NOTIMESTAMPS, | 
| -    .metadata_conv = ff_id3v2_metadata_conv, | 
| }; | 
| #endif | 
|  |