adding ff prefix to avoid global name conficts with xvid (patch by Marko Kreen <marko...

Originally committed as revision 739 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index e1a4e9c..c832939 100644 (file)
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -46,8 +46,8 @@ op_pixels_abs_func pix_abs8x8_xy2;
 UINT8 cropTbl[256 + 2 * MAX_NEG_CROP];
 UINT32 squareTbl[512];
 
-extern INT16 default_intra_matrix[64];
-extern INT16 default_non_intra_matrix[64];
+extern INT16 ff_mpeg1_default_intra_matrix[64];
+extern INT16 ff_mpeg1_default_non_intra_matrix[64];
 extern INT16 ff_mpeg4_default_intra_matrix[64];
 extern INT16 ff_mpeg4_default_non_intra_matrix[64];
 
@@ -1322,8 +1322,8 @@ void dsputil_init(void)
             j = ff_alternate_vertical_scan[i];
             ff_alternate_vertical_scan[i] = block_permute_op(j);
         }
-        block_permute(default_intra_matrix);
-        block_permute(default_non_intra_matrix);
+        block_permute(ff_mpeg1_default_intra_matrix);
+        block_permute(ff_mpeg1_default_non_intra_matrix);
         block_permute(ff_mpeg4_default_intra_matrix);
         block_permute(ff_mpeg4_default_non_intra_matrix);
     }

diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index 53c4e32..7b2bb99 100644 (file)
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -1540,7 +1540,7 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx,
 #endif
     } else {
         for(i=0;i<64;i++) {
-            v = default_intra_matrix[i];
+            v = ff_mpeg1_default_intra_matrix[i];
             s->intra_matrix[i] = v;
             s->chroma_intra_matrix[i] = v;
         }
@@ -1560,7 +1560,7 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx,
 #endif
     } else {
         for(i=0;i<64;i++) {
-            v = default_non_intra_matrix[i];
+            v = ff_mpeg1_default_non_intra_matrix[i];
             s->inter_matrix[i] = v;
             s->chroma_inter_matrix[i] = v;
         }

diff --git a/libavcodec/mpeg12data.h b/libavcodec/mpeg12data.h
index cfb6e1d..041708f 100644 (file)
--- a/libavcodec/mpeg12data.h
+++ b/libavcodec/mpeg12data.h
@@ -2,7 +2,7 @@
  * MPEG1/2 tables
  */
 
-INT16 default_intra_matrix[64] = {
+INT16 ff_mpeg1_default_intra_matrix[64] = {
        8, 16, 19, 22, 26, 27, 29, 34,
        16, 16, 22, 24, 27, 29, 34, 37,
        19, 22, 26, 27, 29, 34, 34, 38,
@@ -13,7 +13,7 @@ INT16 default_intra_matrix[64] = {
        27, 29, 35, 38, 46, 56, 69, 83
 };
 
-INT16 default_non_intra_matrix[64] = {
+INT16 ff_mpeg1_default_non_intra_matrix[64] = {
     16, 16, 16, 16, 16, 16, 16, 16,
     16, 16, 16, 16, 16, 16, 16, 16,
     16, 16, 16, 16, 16, 16, 16, 16,

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 4048cd4..2a16576 100644 (file)
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -520,11 +520,11 @@ int MPV_encode_init(AVCodecContext *avctx)
     /* init default q matrix */
     for(i=0;i<64;i++) {
         if(s->out_format == FMT_H263)
-            s->intra_matrix[i] = default_non_intra_matrix[i];
+            s->intra_matrix[i] = ff_mpeg1_default_non_intra_matrix[i];
         else
-            s->intra_matrix[i] = default_intra_matrix[i];
+            s->intra_matrix[i] = ff_mpeg1_default_intra_matrix[i];
 
-        s->inter_matrix[i] = default_non_intra_matrix[i];
+        s->inter_matrix[i] = ff_mpeg1_default_non_intra_matrix[i];
     }
 
     /* precompute matrix */
@@ -1796,9 +1796,9 @@ static void encode_picture(MpegEncContext *s, int picture_number)
 
     if (s->out_format == FMT_MJPEG) {
         /* for mjpeg, we do include qscale in the matrix */
-        s->intra_matrix[0] = default_intra_matrix[0];
+        s->intra_matrix[0] = ff_mpeg1_default_intra_matrix[0];
         for(i=1;i<64;i++)
-            s->intra_matrix[i] = CLAMP_TO_8BIT((default_intra_matrix[i] * s->qscale) >> 3);
+            s->intra_matrix[i] = CLAMP_TO_8BIT((ff_mpeg1_default_intra_matrix[i] * s->qscale) >> 3);
         convert_matrix(s->q_intra_matrix, s->q_intra_matrix16, 
                        s->q_intra_matrix16_bias, s->intra_matrix, s->intra_quant_bias);
     }

diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index 83a6bd8..cce073b 100644 (file)
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -471,8 +471,8 @@ void ff_fix_long_p_mvs(MpegEncContext * s);
 void ff_fix_long_b_mvs(MpegEncContext * s, int16_t (*mv_table)[2], int f_code, int type);
 
 /* mpeg12.c */
-extern INT16 default_intra_matrix[64];
-extern INT16 default_non_intra_matrix[64];
+extern INT16 ff_mpeg1_default_intra_matrix[64];
+extern INT16 ff_mpeg1_default_non_intra_matrix[64];
 extern UINT8 ff_mpeg1_dc_scale_table[128];
 
 void mpeg1_encode_picture_header(MpegEncContext *s, int picture_number);