Commit ee572c54 authored by Michael Niedermayer's avatar Michael Niedermayer

remove duplicate clip to 8bit function

Originally committed as revision 4143 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent f707a5eb
......@@ -501,8 +501,6 @@ tend= rdtsc();\
#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
......
......@@ -5367,7 +5367,7 @@ static void encode_picture(MpegEncContext *s, int picture_number)
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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment