[SCM] libav/experimental: Put libmpeg2 IDCT functions under CONFIG_GPL, fixes link failure with --disable-opts.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 7c428ea6815e74bd21f02d5520a21cd9db3d6a12
Author: Diego Biurrun <diego at biurrun.de>
Date:   Sat Oct 14 17:04:50 2006 +0000

    Put libmpeg2 IDCT functions under CONFIG_GPL, fixes link failure
    with --disable-opts.
    
    Originally committed as revision 6691 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/i386/dsputil_mmx.c b/libavcodec/i386/dsputil_mmx.c
index 1089335..be2c21e 100644
--- a/libavcodec/i386/dsputil_mmx.c
+++ b/libavcodec/i386/dsputil_mmx.c
@@ -2704,6 +2704,7 @@ void ff_vp3_dsp_init_mmx(void);
 
 /* XXX: those functions should be suppressed ASAP when all IDCTs are
    converted */
+#ifdef CONFIG_GPL
 static void ff_libmpeg2mmx_idct_put(uint8_t *dest, int line_size, DCTELEM *block)
 {
     ff_mmx_idct (block);
@@ -2724,6 +2725,7 @@ static void ff_libmpeg2mmx2_idct_add(uint8_t *dest, int line_size, DCTELEM *bloc
     ff_mmxext_idct (block);
     add_pixels_clamped_mmx(block, dest, line_size);
 }
+#endif
 static void ff_vp3_idct_put_sse2(uint8_t *dest, int line_size, DCTELEM *block)
 {
     ff_vp3_idct_sse2(block);

-- 
Libav/FFmpeg packaging