From: James Courtier-D. <jcd...@us...> - 2003-08-31 16:37:36
|
Update of /cvsroot/xine/xine-lib/src/demuxers In directory sc8-pr-cvs1:/tmp/cvs-serv6749/xine-lib/src/demuxers Modified Files: demux_mpgaudio.c Log Message: Fix .mp3 content detection for .mp3 files with a header or ID3. Info from www.id3.org Index: demux_mpgaudio.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_mpgaudio.c,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- demux_mpgaudio.c 25 Aug 2003 21:51:38 -0000 1.106 +++ demux_mpgaudio.c 31 Aug 2003 16:37:32 -0000 1.107 @@ -57,6 +57,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 ID3_TAG FOURCC_TAG('I', 'D', '3', 3) typedef struct { @@ -107,6 +108,8 @@ static int mpg123_head_check(unsigned long head) { + if (head == ID3_TAG) + return 1; if ((head & 0xffe00000) != 0xffe00000) return 0; if (!((head >> 17) & 3)) |