From cb6bc57681b2ec5232e64db176f41fb2517de146 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Fri, 21 Jan 2011 19:54:34 +0000 Subject: id3v2: split tables for various ID3v2 versions This is needed for upcoming ID3v2.3 muxing support. Signed-off-by: Janne Grunau --- libavformat/id3v2.h | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'libavformat/id3v2.h') 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 */ -- cgit v1.2.3