[xine-cvs] CVS: xine-lib/src/demuxers demux_mpeg.c,1.95,1.96 demux_mpeg_block.c,1.136,1.137 demux_ogg.c,1.51,1.52

[Michael R. <mr...@us...>]

Update of /cvsroot/xine/xine-lib/src/demuxers
In directory usw-pr-cvs1:/tmp/cvs-serv22143/src/demuxers

Modified Files:
	demux_mpeg.c demux_mpeg_block.c demux_ogg.c 
Log Message:
fix wrong abs macro; many thanks to James Slorach for finding this nasty,
well-hidden bug


Index: demux_mpeg.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_mpeg.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- demux_mpeg.c	9 Nov 2002 23:22:32 -0000	1.95
+++ demux_mpeg.c	10 Nov 2002 13:33:13 -0000	1.96
@@ -223,7 +223,7 @@
 
 /* redefine abs as macro to handle 64-bit diffs.
    i guess llabs may not be available everywhere */
-#define abs(x) ( (x<0) ? (-x) : (x) )
+#define abs(x) ( ((x)<0) ? -(x) : (x) )
 
 static void check_newpts( demux_mpeg_t *this, int64_t pts, int video )
 {

Index: demux_mpeg_block.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_mpeg_block.c,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- demux_mpeg_block.c	9 Nov 2002 23:22:32 -0000	1.136
+++ demux_mpeg_block.c	10 Nov 2002 13:33:14 -0000	1.137
@@ -52,7 +52,7 @@
 
 /* redefine abs as macro to handle 64-bit diffs.
    i guess llabs may not be available everywhere */
-#define abs(x) ( (x<0) ? (-x) : (x) )
+#define abs(x) ( ((x)<0) ? -(x) : (x) )
 
 typedef struct demux_mpeg_block_s {
   demux_plugin_t        demux_plugin;

Index: demux_ogg.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_ogg.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- demux_ogg.c	9 Nov 2002 23:22:32 -0000	1.51
+++ demux_ogg.c	10 Nov 2002 13:33:15 -0000	1.52
@@ -157,7 +157,7 @@
 
 /* redefine abs as macro to handle 64-bit diffs.
    i guess llabs may not be available everywhere */
-#define abs(x) ( (x<0) ? (-x) : (x) )
+#define abs(x) ( ((x)<0) ? -(x) : (x) )
 
 static void check_newpts (demux_ogg_t *this, int64_t pts, int video, int preview) {
   int64_t diff;