summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@users.sourceforge.net>2006-02-08 18:29:02 +0000
committerBastien Nocera <hadess@users.sourceforge.net>2006-02-08 18:29:02 +0000
commit3efd2920d1a0187fef29492e13cac3862ed83a1f (patch)
tree15253b60d9bd2fe94e97fd231653e4e45a174c78
parent19c60d307b322031358a3992efada095710e9107 (diff)
downloadxine-lib-3efd2920d1a0187fef29492e13cac3862ed83a1f.tar.gz
xine-lib-3efd2920d1a0187fef29492e13cac3862ed83a1f.tar.bz2
- fix from Thibaut Mattern for the second magic for JPEG files
CVS patchset: 7887 CVS date: 2006/02/08 18:29:02
-rw-r--r--src/demuxers/demux_image.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/demuxers/demux_image.c b/src/demuxers/demux_image.c
index 05031f68a..5964ed089 100644
--- a/src/demuxers/demux_image.c
+++ b/src/demuxers/demux_image.c
@@ -19,7 +19,7 @@
*/
/*
- * $Id: demux_image.c,v 1.19 2006/02/08 09:06:59 hadess Exp $
+ * $Id: demux_image.c,v 1.20 2006/02/08 18:29:02 hadess Exp $
*
* image dummy demultiplexer
*/
@@ -160,7 +160,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen,
}
if (memcmp (header, "GIF", 3) == 0 /* GIF */
|| memcmp (header, "\377\330\377", 3) == 0 /* JPEG */
- || (header[0] & 0xFFFF) == 0xffd8 /* another JPEG */
+ || (BE_16(&header[0]) == 0xffd8) /* another JPEG */
|| memcmp (header, "\x89PNG", 4) == 0) { /* PNG */
break;
}