From 3efd2920d1a0187fef29492e13cac3862ed83a1f Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Wed, 8 Feb 2006 18:29:02 +0000 Subject: - fix from Thibaut Mattern for the second magic for JPEG files CVS patchset: 7887 CVS date: 2006/02/08 18:29:02 --- src/demuxers/demux_image.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') 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; } -- cgit v1.2.3