mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-01-08 00:00:49 +00:00
remove duplicate clip to 8bit function
Originally committed as revision 4143 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
f707a5ebba
commit
ee572c5482
@ -501,8 +501,6 @@ tend= rdtsc();\
|
|||||||
#define STOP_TIMER(id) {}
|
#define STOP_TIMER(id) {}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define CLAMP_TO_8BIT(d) ((d > 0xff) ? 0xff : (d < 0) ? 0 : d)
|
|
||||||
|
|
||||||
/* avoid usage of various functions */
|
/* avoid usage of various functions */
|
||||||
#define malloc please_use_av_malloc
|
#define malloc please_use_av_malloc
|
||||||
#define free please_use_av_free
|
#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++){
|
for(i=1;i<64;i++){
|
||||||
int j= s->dsp.idct_permutation[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,
|
convert_matrix(&s->dsp, s->q_intra_matrix, s->q_intra_matrix16,
|
||||||
s->intra_matrix, s->intra_quant_bias, 8, 8, 1);
|
s->intra_matrix, s->intra_quant_bias, 8, 8, 1);
|
||||||
|
Loading…
Reference in New Issue
Block a user