fix wrong abs macro; many thanks to James Slorach for finding this nasty,

well-hidden bug

CVS patchset: 3220
CVS date: 2002/11/10 13:33:13

4 files changed, 8 insertions, 8 deletions

diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c
index c6fe792b5..97092dd7e 100644
--- a/src/demuxers/demux_mpeg.c
+++ b/src/demuxers/demux_mpeg.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_mpeg.c,v 1.95 2002/11/09 23:22:32 guenter Exp $
+ * $Id: demux_mpeg.c,v 1.96 2002/11/10 13:33:13 mroi Exp $
  *
  * demultiplexer for mpeg 1/2 program streams
  * reads streams of variable blocksizes
@@ -223,7 +223,7 @@ static uint32_t read_bytes (demux_mpeg_t *this, int n) {
 
 /* 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 )
 {
diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c
index b6b1608dc..6c450685b 100644
--- a/src/demuxers/demux_mpeg_block.c
+++ b/src/demuxers/demux_mpeg_block.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_mpeg_block.c,v 1.136 2002/11/09 23:22:32 guenter Exp $
+ * $Id: demux_mpeg_block.c,v 1.137 2002/11/10 13:33:14 mroi Exp $
  *
  * demultiplexer for mpeg 1/2 program streams
  *
@@ -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;
diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c
index eae65a6d0..b16258b43 100644
--- a/src/demuxers/demux_ogg.c
+++ b/src/demuxers/demux_ogg.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_ogg.c,v 1.51 2002/11/09 23:22:32 guenter Exp $
+ * $Id: demux_ogg.c,v 1.52 2002/11/10 13:33:15 mroi Exp $
  *
  * demultiplexer for ogg streams
  *
@@ -157,7 +157,7 @@ static void hex_dump (uint8_t *p, int length) {
 
 /* 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;
diff --git a/src/xine-engine/metronom.c b/src/xine-engine/metronom.c
index 71480e0d0..b8f750540 100644
--- a/src/xine-engine/metronom.c
+++ b/src/xine-engine/metronom.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: metronom.c,v 1.98 2002/11/08 18:47:19 tmattern Exp $
+ * $Id: metronom.c,v 1.99 2002/11/10 13:33:16 mroi Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -51,7 +51,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) )
 
 /*
 #define LOG