[SCM] libav/experimental: id3v2: use a named constant instead of 0x02
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 17:19:49 UTC 2013
The following commit has been merged in the experimental branch:
commit 7a07d158bde2f75a53211acb683dc73dec21dd1a
Author: Anton Khirnov <wyskas at gmail.com>
Date: Tue Dec 7 07:52:50 2010 +0000
id3v2: use a named constant instead of 0x02
Originally committed as revision 25902 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c
index c0fab69..874815a 100644
--- a/libavformat/id3v2.c
+++ b/libavformat/id3v2.c
@@ -211,7 +211,7 @@ void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t flags)
}else
tlen = get_size(s->pb, 4);
tflags = get_be16(s->pb);
- tunsync = tflags & 0x02;
+ tunsync = tflags & ID3v2_FLAG_UNSYNCH;
} else {
get_buffer(s->pb, tag, 3);
tag[3] = 0;
diff --git a/libavformat/id3v2.h b/libavformat/id3v2.h
index 48373bb..4c3041f 100644
--- a/libavformat/id3v2.h
+++ b/libavformat/id3v2.h
@@ -33,6 +33,11 @@
*/
#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
+
/**
* Detect ID3v2 Header.
* @param buf must be ID3v2_HEADER_SIZE byte long
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list