diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-01-21 19:54:34 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-01-23 19:32:07 +0100 |
| commit | fe01dd8d74ddc121a242b0737d9cdad0bc537224 (patch) | |
| tree | 29afb6c24b30f746e5f7b0e46e82b9bcf149f9fb /libavformat/id3v2.h | |
| parent | 5052830fecfd43edc8dc67641ebe7ddb51c8b052 (diff) | |
| download | ffmpeg-fe01dd8d74ddc121a242b0737d9cdad0bc537224.tar.gz | |
id3v2: split tables for various ID3v2 versions
This is needed for upcoming ID3v2.3 muxing support.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit cb6bc57681b2ec5232e64db176f41fb2517de146)
Diffstat (limited to 'libavformat/id3v2.h')
| -rw-r--r-- | libavformat/id3v2.h | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/libavformat/id3v2.h b/libavformat/id3v2.h index c2e1add849..e429001385 100644 --- a/libavformat/id3v2.h +++ b/libavformat/id3v2.h @@ -65,12 +65,25 @@ int ff_id3v2_tag_len(const uint8_t *buf); */ void ff_id3v2_read(AVFormatContext *s, const char *magic); -extern const AVMetadataConv ff_id3v2_metadata_conv[]; +extern const AVMetadataConv ff_id3v2_34_metadata_conv[]; +extern const AVMetadataConv ff_id3v2_4_metadata_conv[]; +extern const AVMetadataConv ff_id3v2_2_metadata_conv[]; /** - * A list of ID3v2.4 text information frames. + * A list of text information frames allowed in both ID3 v2.3 and v2.4 * http://www.id3.org/id3v2.4.0-frames + * http://www.id3.org/id3v2.4.0-changes */ extern const char ff_id3v2_tags[][4]; +/** + * ID3v2.4-only text information frames. + */ +extern const char ff_id3v2_4_tags[][4]; + +/** + * ID3v2.3-only text information frames. + */ +extern const char ff_id3v2_3_tags[][4]; + #endif /* AVFORMAT_ID3V2_H */ |