*/
#define ID3v2_DEFAULT_MAGIC "ID3"
+#define ID3v2_FLAG_DATALEN 0x0001
+#define ID3v2_FLAG_UNSYNCH 0x0002
+#define ID3v2_FLAG_ENCRYPTION 0x0004
+#define ID3v2_FLAG_COMPRESSION 0x0008
+
+enum ID3v2Encoding {
+ ID3v2_ENCODING_ISO8859 = 0,
+ ID3v2_ENCODING_UTF16BOM = 1,
+ ID3v2_ENCODING_UTF16BE = 2,
+ ID3v2_ENCODING_UTF8 = 3,
+};
+
/**
* Detect ID3v2 Header.
* @param buf must be ID3v2_HEADER_SIZE byte long
*/
int ff_id3v2_tag_len(const uint8_t *buf);
-/**
- * ID3v2 parser
- * Handles ID3v2.2, 2.3 and 2.4.
- */
-void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t flags);
-
/**
* Read an ID3v2 tag
*/
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 */