summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/demuxers/id3.c2
-rw-r--r--src/demuxers/id3.h5
2 files changed, 2 insertions, 5 deletions
diff --git a/src/demuxers/id3.c b/src/demuxers/id3.c
index 8f6878656..0ec1cdaa5 100644
--- a/src/demuxers/id3.c
+++ b/src/demuxers/id3.c
@@ -852,7 +852,7 @@ int id3v24_parse_tag(input_plugin_t *input,
int id3v2_parse_tag(input_plugin_t *input,
xine_stream_t *stream,
uint32_t id3_signature) {
- _x_assert(mp3_frame_header[0] == 'I' && mp3_frame_header[1] == 'D' && mp3_frame_header[2] == '3');
+ _x_assert((id3_signature & ID3V2X_MASK) == ID3V2X_TAG);
int result = 0;
diff --git a/src/demuxers/id3.h b/src/demuxers/id3.h
index 711087a95..897bb6cd0 100644
--- a/src/demuxers/id3.h
+++ b/src/demuxers/id3.h
@@ -174,10 +174,7 @@ int id3v2_parse_tag(input_plugin_t *input,
* @param ptr Pointer to the first 10 bytes of the ID3 tag
*/
static inline int id3v2_istag(uint32_t id3_signature) {
- return
- (ptr[0] == 'I') &&
- (ptr[1] == 'D') &&
- (ptr[2] == '3');
+ return (id3_signature & ID3V2X_MASK) == ID3V2X_TAG;
}
#if 0