Browse Source

remove duplicate clip to 8bit function

Originally committed as revision 4143 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Michael Niedermayer 21 years ago
parent
commit
ee572c5482
2 changed files with 1 additions and 3 deletions
  1. +0
    -2
      libavcodec/common.h
  2. +1
    -1
      libavcodec/mpegvideo.c

+ 0
- 2
libavcodec/common.h View File

@@ -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


+ 1
- 1
libavcodec/mpegvideo.c View File

@@ -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);


Loading…
Cancel
Save