summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-12-13 16:20:18 +0100
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-12-13 16:20:18 +0100
commit734004e1e3e0dba0805536c4698bfb1f5e9cf0d1 (patch)
tree1c211123cd03103b1ad73244fa2f5175217319f9
parent695b0af385ee1c93e750c383f9c837a772fd286a (diff)
downloadxine-lib-734004e1e3e0dba0805536c4698bfb1f5e9cf0d1.tar.gz
xine-lib-734004e1e3e0dba0805536c4698bfb1f5e9cf0d1.tar.bz2
Don't byteswap head, so that (machine-endian) ID3 tag macros can be tested. Swap MPEG_MARKER to make it compatible.
--HG-- extra : transplant_source : %FEP%3B%17E%84%B5%A9%FF%28%5B%18%20f%C0h%29hU%3D
-rw-r--r--src/demuxers/demux_mpgaudio.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c
index 9b8033c7c..d4e3d8473 100644
--- a/src/demuxers/demux_mpgaudio.c
+++ b/src/demuxers/demux_mpgaudio.c
@@ -59,7 +59,7 @@
#define RIFF_TAG FOURCC_TAG('R', 'I', 'F', 'F')
#define AVI_TAG FOURCC_TAG('A', 'V', 'I', ' ')
#define CDXA_TAG FOURCC_TAG('C', 'D', 'X', 'A')
-#define MPEG_MARKER FOURCC_TAG( 0x00, 0x00, 0x01, 0xBA )
+#define MPEG_MARKER ME_FOURCC( 0x00, 0x00, 0x01, 0xBA )
/* Xing header stuff */
@@ -682,10 +682,9 @@ static int detect_mpgaudio_file(input_plugin_t *input) {
if (preview_len < 4)
return 0;
- lprintf("got preview %02x %02x %02x %02x\n",
- buf[0], buf[1], buf[2], buf[3]);
+ head = _X_ME_32(buf);
- head = _X_BE_32(buf);
+ lprintf("got preview %08x\n", head);
if ((head == ID3V22_TAG) ||
(head == ID3V23_TAG) ||