Mercurial > libavcodec.hg

changeset 11495:2029a714b794 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add ff_ prefix for mpeg2_dc_scale_table.
author michael
date Mon, 15 Mar 2010 22:49:46 +0000
parents ed6cd3544622
children 1ce187c7a611
files mpeg12.c mpegvideo.c mpegvideo.h mpegvideo_enc.c
diffstat 4 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mpeg12.c	Mon Mar 15 21:27:13 2010 +0000
+++ b/mpeg12.c	Mon Mar 15 22:49:46 2010 +0000
@@ -122,7 +122,7 @@
 {
 
     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];
 
 }
 
--- a/mpegvideo.c	Mon Mar 15 21:27:13 2010 +0000
+++ b/mpegvideo.c	Mon Mar 15 22:49:46 2010 +0000
@@ -100,7 +100,7 @@
     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,
--- a/mpegvideo.h	Mon Mar 15 21:27:13 2010 +0000
+++ b/mpegvideo.h	Mon Mar 15 22:49:46 2010 +0000
@@ -774,7 +774,7 @@
 
 /* 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,
--- a/mpegvideo_enc.c	Mon Mar 15 21:27:13 2010 +0000
+++ b/mpegvideo_enc.c	Mon Mar 15 22:49:46 2010 +0000
@@ -2900,8 +2900,8 @@
             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;