[SCM] libav/experimental: avoid name clash with libjpeg - added missing externs

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 03c94ede9365c22855c4f63941a13d0a4574f7a4
Author: Fabrice Bellard <fabrice at bellard.org>
Date:   Tue Jun 4 12:58:40 2002 +0000

    avoid name clash with libjpeg - added missing externs
    
    Originally committed as revision 660 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c
index 2a26b47..561a787 100644
--- a/libavcodec/dct-test.c
+++ b/libavcodec/dct-test.c
@@ -90,7 +90,7 @@ void dct_error(const char *name, int is_idct,
         fdct_func(block);
         emms(); /* for ff_mmx_idct */
 
-        if (fdct_func == jpeg_fdct_ifast) {
+        if (fdct_func == fdct_ifast) {
             for(i=0; i<64; i++) {
                 scale = (1 << (AANSCALE_BITS + 11)) / aanscales[i];
                 block[i] = (block[i] * scale) >> AANSCALE_BITS;
@@ -173,7 +173,7 @@ int main(int argc, char **argv)
 
     if (!test_idct) {
         dct_error("REF", 0, fdct, fdct); /* only to verify code ! */
-        dct_error("AAN", 0, jpeg_fdct_ifast, fdct);
+        dct_error("AAN", 0, fdct_ifast, fdct);
         dct_error("MMX", 0, fdct_mmx, fdct);
     } else {
         dct_error("REF", 1, idct, idct);
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index ff26010..8e91ab3 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -23,6 +23,7 @@
 #include "simple_idct.h"
 
 void (*ff_idct)(DCTELEM *block);
+void (*av_fdct)(DCTELEM *block);
 void (*get_pixels)(DCTELEM *block, const UINT8 *pixels, int line_size);
 void (*diff_pixels)(DCTELEM *block, const UINT8 *s1, const UINT8 *s2, int stride);
 void (*put_pixels_clamped)(const DCTELEM *block, UINT8 *pixels, int line_size);
@@ -1278,7 +1279,7 @@ void dsputil_init(void)
     pix_abs8x8_x2  = pix_abs8x8_x2_c;
     pix_abs8x8_y2  = pix_abs8x8_y2_c;
     pix_abs8x8_xy2 = pix_abs8x8_xy2_c;
-    av_fdct = jpeg_fdct_ifast;
+    av_fdct = fdct_ifast;
 
     use_permuted_idct = 1;
 
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h
index 64559c7..062b510 100644
--- a/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@@ -26,13 +26,13 @@
 /* dct code */
 typedef short DCTELEM;
 
-void jpeg_fdct_ifast (DCTELEM *data);
+void fdct_ifast (DCTELEM *data);
 
 void j_rev_dct (DCTELEM *data);
 
 void fdct_mmx(DCTELEM *block);
 
-void (*av_fdct)(DCTELEM *block);
+extern void (*av_fdct)(DCTELEM *block);
 
 /* encoding scans */
 extern UINT8 ff_alternate_horizontal_scan[64];
diff --git a/libavcodec/jfdctfst.c b/libavcodec/jfdctfst.c
index 25d0d22..4e3b55b 100644
--- a/libavcodec/jfdctfst.c
+++ b/libavcodec/jfdctfst.c
@@ -113,7 +113,7 @@
  */
 
 GLOBAL(void)
-jpeg_fdct_ifast (DCTELEM * data)
+fdct_ifast (DCTELEM * data)
 {
   DCTELEM tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
   DCTELEM tmp10, tmp11, tmp12, tmp13;
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index f63b24b..ea5a980 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -81,7 +81,7 @@ static void convert_matrix(int (*qmat)[64], uint16_t (*qmat16)[64], uint16_t (*q
 
     for(qscale=1; qscale<32; qscale++){
         int i;
-        if (av_fdct == jpeg_fdct_ifast) {
+        if (av_fdct == fdct_ifast) {
             for(i=0;i<64;i++) {
                 const int j= block_permute_op(i);
                 /* 16 <= qscale * quant_matrix[i] <= 7905 */

-- 
Libav/FFmpeg packaging