Revision fe01dd8d libavformat/id3v2.c

View differences:

libavformat/id3v2.c
273 273
            url_fseek(s->pb, off, SEEK_SET);
274 274
        }
275 275
    } while (found_header);
276
    ff_metadata_conv(&s->metadata, NULL, ff_id3v2_metadata_conv);
276
    ff_metadata_conv(&s->metadata, NULL, ff_id3v2_34_metadata_conv);
277
    ff_metadata_conv(&s->metadata, NULL, ff_id3v2_2_metadata_conv);
278
    ff_metadata_conv(&s->metadata, NULL, ff_id3v2_4_metadata_conv);
277 279
}
278 280

  
279
const AVMetadataConv ff_id3v2_metadata_conv[] = {
281
const AVMetadataConv ff_id3v2_34_metadata_conv[] = {
280 282
    { "TALB", "album"},
281
    { "TAL",  "album"},
282 283
    { "TCOM", "composer"},
283 284
    { "TCON", "genre"},
284
    { "TCO",  "genre"},
285 285
    { "TCOP", "copyright"},
286
    { "TDRL", "date"},
287
    { "TDRC", "date"},
288
    { "TDEN", "creation_time"},
289 286
    { "TENC", "encoded_by"},
290
    { "TEN",  "encoded_by"},
291 287
    { "TIT2", "title"},
292
    { "TT2",  "title"},
293 288
    { "TLAN", "language"},
294 289
    { "TPE1", "artist"},
295
    { "TP1",  "artist"},
296 290
    { "TPE2", "album_artist"},
297
    { "TP2",  "album_artist"},
298 291
    { "TPE3", "performer"},
299
    { "TP3",  "performer"},
300 292
    { "TPOS", "disc"},
301 293
    { "TPUB", "publisher"},
302 294
    { "TRCK", "track"},
303
    { "TRK",  "track"},
295
    { "TSSE", "encoder"},
296
    { 0 }
297
};
298

  
299
const AVMetadataConv ff_id3v2_4_metadata_conv[] = {
300
    { "TDRL", "date"},
301
    { "TDRC", "date"},
302
    { "TDEN", "creation_time"},
304 303
    { "TSOA", "album-sort"},
305 304
    { "TSOP", "artist-sort"},
306 305
    { "TSOT", "title-sort"},
307
    { "TSSE", "encoder"},
308 306
    { 0 }
309 307
};
310 308

  
309
const AVMetadataConv ff_id3v2_2_metadata_conv[] = {
310
    { "TAL",  "album"},
311
    { "TCO",  "genre"},
312
    { "TT2",  "title"},
313
    { "TEN",  "encoded_by"},
314
    { "TP1",  "artist"},
315
    { "TP2",  "album_artist"},
316
    { "TP3",  "performer"},
317
    { "TRK",  "track"},
318
    { 0 }
319
};
320

  
321

  
311 322
const char ff_id3v2_tags[][4] = {
312
   "TALB", "TBPM", "TCOM", "TCON", "TCOP", "TDEN", "TDLY", "TDOR", "TDRC",
313
   "TDRL", "TDTG", "TENC", "TEXT", "TFLT", "TIPL", "TIT1", "TIT2", "TIT3",
314
   "TKEY", "TLAN", "TLEN", "TMCL", "TMED", "TMOO", "TOAL", "TOFN", "TOLY",
315
   "TOPE", "TOWN", "TPE1", "TPE2", "TPE3", "TPE4", "TPOS", "TPRO", "TPUB",
316
   "TRCK", "TRSN", "TRSO", "TSOA", "TSOP", "TSOT", "TSRC", "TSSE", "TSST",
323
   "TALB", "TBPM", "TCOM", "TCON", "TCOP", "TDLY", "TENC", "TEXT",
324
   "TFLT", "TIT1", "TIT2", "TIT3", "TKEY", "TLAN", "TLEN", "TMED",
325
   "TOAL", "TOFN", "TOLY", "TOPE", "TOWN", "TPE1", "TPE2", "TPE3",
326
   "TPE4", "TPOS", "TPUB", "TRCK", "TRSN", "TRSO", "TSRC", "TSSE",
327
   { 0 },
328
};
329

  
330
const char ff_id3v2_4_tags[][4] = {
331
   "TDEN", "TDOR", "TDRC", "TDRL", "TDTG", "TIPL", "TMCL", "TMOO",
332
   "TPRO", "TSOA", "TSOP", "TSOT", "TSST",
333
   { 0 },
334
};
335

  
336
const char ff_id3v2_3_tags[][4] = {
337
   "TDAT", "TIME", "TORY", "TRDA", "TSIZ", "TYER",
317 338
   { 0 },
318 339
};

Also available in: Unified diff