mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Add ff_ prefix for mpeg2_dc_scale_table.
Originally committed as revision 22556 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
6dfa52c8bd
commit
53f66cee0c
@ -122,7 +122,7 @@ void ff_mpeg12_common_init(MpegEncContext *s)
|
||||
{
|
||||
|
||||
s->y_dc_scale_table=
|
||||
s->c_dc_scale_table= mpeg2_dc_scale_table[s->intra_dc_precision];
|
||||
s->c_dc_scale_table= ff_mpeg2_dc_scale_table[s->intra_dc_precision];
|
||||
|
||||
}
|
||||
|
||||
|
@ -100,7 +100,7 @@ static const uint8_t mpeg2_dc_scale_table3[128]={
|
||||
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
||||
};
|
||||
|
||||
const uint8_t * const mpeg2_dc_scale_table[4]={
|
||||
const uint8_t * const ff_mpeg2_dc_scale_table[4]={
|
||||
ff_mpeg1_dc_scale_table,
|
||||
mpeg2_dc_scale_table1,
|
||||
mpeg2_dc_scale_table2,
|
||||
|
@ -774,7 +774,7 @@ int ff_get_mb_score(MpegEncContext * s, int mx, int my, int src_index,
|
||||
|
||||
/* mpeg12.c */
|
||||
extern const uint8_t ff_mpeg1_dc_scale_table[128];
|
||||
extern const uint8_t * const mpeg2_dc_scale_table[4];
|
||||
extern const uint8_t * const ff_mpeg2_dc_scale_table[4];
|
||||
|
||||
void mpeg1_encode_picture_header(MpegEncContext *s, int picture_number);
|
||||
void mpeg1_encode_mb(MpegEncContext *s,
|
||||
|
@ -2900,8 +2900,8 @@ static int encode_picture(MpegEncContext *s, int picture_number)
|
||||
s->intra_matrix[j] = av_clip_uint8((ff_mpeg1_default_intra_matrix[i] * s->qscale) >> 3);
|
||||
}
|
||||
s->y_dc_scale_table=
|
||||
s->c_dc_scale_table= mpeg2_dc_scale_table[s->intra_dc_precision];
|
||||
s->intra_matrix[0] = mpeg2_dc_scale_table[s->intra_dc_precision][8];
|
||||
s->c_dc_scale_table= ff_mpeg2_dc_scale_table[s->intra_dc_precision];
|
||||
s->intra_matrix[0] = ff_mpeg2_dc_scale_table[s->intra_dc_precision][8];
|
||||
ff_convert_matrix(&s->dsp, s->q_intra_matrix, s->q_intra_matrix16,
|
||||
s->intra_matrix, s->intra_quant_bias, 8, 8, 1);
|
||||
s->qscale= 8;
|
||||
|
Loading…
Reference in New Issue
Block a user