# HG changeset patch
# User michael
# Date 1113991515 0
# Node ID 08cce478556755bb94e2434e9946d0130c2af2ef
# Parent  c39756a516a5ce4f21f890f7810b8c6988b0700f
remove duplicate clip to 8bit function

diff -r c39756a516a5 -r 08cce4785567 common.h
--- a/common.h	Wed Apr 20 09:52:04 2005 +0000
+++ b/common.h	Wed Apr 20 10:05:15 2005 +0000
@@ -501,8 +501,6 @@
 #define STOP_TIMER(id) {}
 #endif
 
-#define CLAMP_TO_8BIT(d) ((d > 0xff) ? 0xff : (d < 0) ? 0 : d)
-
 /* avoid usage of various functions */
 #define malloc please_use_av_malloc
 #define free please_use_av_free
diff -r c39756a516a5 -r 08cce4785567 mpegvideo.c
--- a/mpegvideo.c	Wed Apr 20 09:52:04 2005 +0000
+++ b/mpegvideo.c	Wed Apr 20 10:05:15 2005 +0000
@@ -5367,7 +5367,7 @@
         for(i=1;i<64;i++){
             int j= s->dsp.idct_permutation[i];
 
-            s->intra_matrix[j] = CLAMP_TO_8BIT((ff_mpeg1_default_intra_matrix[i] * s->qscale) >> 3);
+            s->intra_matrix[j] = clip_uint8((ff_mpeg1_default_intra_matrix[i] * s->qscale) >> 3);
         }
         convert_matrix(&s->dsp, s->q_intra_matrix, s->q_intra_matrix16, 
                        s->intra_matrix, s->intra_quant_bias, 8, 8, 1);