diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-03-15 22:49:46 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-03-15 22:49:46 +0000 |
| commit | 53f66cee0cb99e6fad4c4d1c13153e6e8e9fd53b (patch) | |
| tree | f4663a3d08384e0a8845a9d2e61fe5b11c7f76ec | |
| parent | 6dfa52c8bde96af2f16998c896ea6b37927d5dcc (diff) | |
Add ff_ prefix for mpeg2_dc_scale_table.
Originally committed as revision 22556 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/mpeg12.c | 2 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.c | 2 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.h | 2 | ||||
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 09bac2d860..4ae5b6430a 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -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]; } diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 23e63a8433..1dbe7eda96 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -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, diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 1f876b7cb6..5302be947c 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -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, diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index ba1f690800..44a0d81e56 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -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; |