[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec mpegvideo.c, 1.473, 1.474 common.h, 1.148, 1.149

[Michael Niedermayer CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv32330

Modified Files:
	mpegvideo.c common.h 
Log Message:
remove duplicate clip to 8bit function


Index: mpegvideo.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mpegvideo.c,v
retrieving revision 1.473
retrieving revision 1.474
diff -u -d -r1.473 -r1.474
--- mpegvideo.c	19 Apr 2005 04:29:11 -0000	1.473
+++ mpegvideo.c	20 Apr 2005 10:05:15 -0000	1.474
@@ -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);

Index: common.h
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/common.h,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- common.h	18 Apr 2005 11:24:20 -0000	1.148
+++ common.h	20 Apr 2005 10:05:15 -0000	1.149
@@ -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