Revision 03700d39 libavformat/mp3.c

View differences:

libavformat/mp3.c
195 195
    mp3_read_packet,
196 196
    .flags= AVFMT_GENERIC_INDEX,
197 197
    .extensions = "mp2,mp3,m2a", /* XXX: use probe */
198
    .metadata_conv = ff_id3v2_metadata_conv,
199 198
};
200 199
#endif
201 200

  
......
294 293
    NULL,
295 294
    mp3_write_packet,
296 295
    mp3_write_trailer,
297
    .metadata_conv = ff_id3v2_metadata_conv,
298 296
};
299 297
#endif
300 298

  
......
317 315
    size_pos = url_ftell(s->pb);
318 316
    put_be32(s->pb, 0);
319 317

  
318
    metadata_conv(&s->metadata, ff_id3v2_metadata_conv, NULL);
320 319
    while ((t = av_metadata_get(s->metadata, "", t, AV_METADATA_IGNORE_SUFFIX))) {
321 320
        uint32_t tag = 0;
322 321

  
......
366 365
    mp3_write_packet,
367 366
    mp3_write_trailer,
368 367
    AVFMT_NOTIMESTAMPS,
369
    .metadata_conv = ff_id3v2_metadata_conv,
370 368
};
371 369
#endif

Also available in: Unified diff