diff options
| author | Mike Melanson <mike@multimedia.cx> | 2003-11-18 04:35:14 +0000 |
|---|---|---|
| committer | Mike Melanson <mike@multimedia.cx> | 2003-11-18 04:35:14 +0000 |
| commit | 715d34706910a0470713dcc3504b9572ce1a459d (patch) | |
| tree | 6be4e657bdc8e799102afdd35ab36d9a2e54000a | |
| parent | 5fe41b2ab56969bb992855da7fbbbf35accee3ba (diff) | |
| download | xine-lib-715d34706910a0470713dcc3504b9572ce1a459d.tar.gz xine-lib-715d34706910a0470713dcc3504b9572ce1a459d.tar.bz2 | |
disqualify another type of RIFF file (4xm files)
CVS patchset: 5760
CVS date: 2003/11/18 04:35:14
| -rw-r--r-- | src/demuxers/demux_mpeg.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c index 2663fd074..b30d4fd67 100644 --- a/src/demuxers/demux_mpeg.c +++ b/src/demuxers/demux_mpeg.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_mpeg.c,v 1.129 2003/11/16 23:33:43 f1rmb Exp $ + * $Id: demux_mpeg.c,v 1.130 2003/11/18 04:35:14 tmmm Exp $ * * demultiplexer for mpeg 1/2 program streams * reads streams of variable blocksizes @@ -98,6 +98,7 @@ typedef struct { #define RIFF_TAG FOURCC_TAG('R', 'I', 'F', 'F') #define WAVE_TAG FOURCC_TAG('W', 'A', 'V', 'E') #define AVI_TAG FOURCC_TAG('A', 'V', 'I', ' ') +#define FOURXM_TAG FOURCC_TAG('4', 'X', 'M', 'V') /* arbitrary number of initial file bytes to check for an MPEG marker */ #define RIFF_CHECK_KILOBYTES 1024 @@ -1072,7 +1073,8 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str /* disregard the RIFF file if it is certainly a better known * format like AVI or WAVE */ if ((fourcc_tag == WAVE_TAG) || - (fourcc_tag == AVI_TAG)) { + (fourcc_tag == AVI_TAG) || + (fourcc_tag == FOURXM_TAG)) { free (this); return NULL; } |