Patch by Anton Khirnov, wyskas gmail Originally committed as revision 20073 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.6
| @@ -242,3 +242,22 @@ void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t flags) | |||||
| av_log(s, AV_LOG_INFO, "ID3v2.%d tag skipped, cannot handle %s\n", version, reason); | av_log(s, AV_LOG_INFO, "ID3v2.%d tag skipped, cannot handle %s\n", version, reason); | ||||
| url_fskip(s->pb, len); | url_fskip(s->pb, len); | ||||
| } | } | ||||
| const AVMetadataConv ff_id3v2_metadata_conv[] = { | |||||
| { "TALB", "album"}, | |||||
| { "TCOM", "composer"}, | |||||
| { "TCON", "genre"}, | |||||
| { "TCOP", "copyright"}, | |||||
| { "TDRL", "date"}, | |||||
| { "TENC", "encoder"}, | |||||
| { "TIT2", "title"}, | |||||
| { "TLAN", "language"}, | |||||
| { "TPE1", "author"}, | |||||
| { "TPOS", "disc"}, | |||||
| { "TPUB", "publisher"}, | |||||
| { "TRCK", "track"}, | |||||
| { "TSOA", "albumsort"}, | |||||
| { "TSOP", "authorsort"}, | |||||
| { "TSOT", "titlesort"}, | |||||
| { 0 } | |||||
| }; | |||||
| @@ -24,6 +24,7 @@ | |||||
| #include <stdint.h> | #include <stdint.h> | ||||
| #include "avformat.h" | #include "avformat.h" | ||||
| #include "metadata.h" | |||||
| #define ID3v2_HEADER_SIZE 10 | #define ID3v2_HEADER_SIZE 10 | ||||
| @@ -51,4 +52,6 @@ void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t flags) | |||||
| */ | */ | ||||
| void ff_id3v2_read(AVFormatContext *s); | void ff_id3v2_read(AVFormatContext *s); | ||||
| extern const AVMetadataConv ff_id3v2_metadata_conv[]; | |||||
| #endif /* AVFORMAT_ID3V2_H */ | #endif /* AVFORMAT_ID3V2_H */ | ||||
| @@ -341,5 +341,6 @@ AVOutputFormat mp3_muxer = { | |||||
| mp3_write_header, | mp3_write_header, | ||||
| mp3_write_packet, | mp3_write_packet, | ||||
| mp3_write_trailer, | mp3_write_trailer, | ||||
| .metadata_conv = ff_id3v2_metadata_conv, | |||||
| }; | }; | ||||
| #endif | #endif | ||||