[MPlayer-cvslog] r23137 - in trunk: configure libmpcodecs/vf.c

[diego]

Author: diego
Date: Thu Apr 26 15:20:18 2007
New Revision: 23137

Log:
Add config.h variables for static FFmpeg libraries.


Modified:
   trunk/configure
   trunk/libmpcodecs/vf.c

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Thu Apr 26 15:20:18 2007
@@ -6176,9 +6176,11 @@ EOF
 fi
 _libavutil=no
 _def_libavutil='#undef USE_LIBAVUTIL'
+_def_libavutil_a='#undef USE_LIBAVUTIL_A'
 _def_libavutil_so='#undef USE_LIBAVUTIL_SO'
 test "$_libavutil_a" = yes || test "$_libavutil_so" = yes && _libavutil=yes
-test "$_libavutil_a"  = yes && _def_libavutil='#define USE_LIBAVUTIL 1'
+test "$_libavutil"    = yes && _def_libavutil='#define USE_LIBAVUTIL 1'
+test "$_libavutil_a"  = yes && _def_libavutil='#define USE_LIBAVUTIL_A 1'
 test "$_libavutil_so" = yes && _def_libavutil='#define USE_LIBAVUTIL_SO 1'
 # neither static nor shared libavutil is available, but it is mandatory ...
 if test "$_libavutil" = no ; then
@@ -6213,12 +6215,11 @@ EOF
 fi
 _libavcodec=no
 _def_libavcodec='#undef USE_LIBAVCODEC'
+_def_libavcodec_a='#undef USE_LIBAVCODEC_A'
 _def_libavcodec_so='#undef USE_LIBAVCODEC_SO'
-_def_lavc_dsputil='#undef USE_LIBAVCODEC_DSPUTIL'
 test "$_libavcodec_a" = yes || test "$_libavcodec_so" = yes && _libavcodec=yes
-test "$_libavcodec_a" = yes \
-  && _def_lavc_dsputil='#define USE_LIBAVCODEC_DSPUTIL'
 test "$_libavcodec"    = yes && _def_libavcodec='#define USE_LIBAVCODEC 1'
+test "$_libavcodec_a"  = yes && _def_libavcodec='#define USE_LIBAVCODEC_A 1'
 test "$_libavcodec_so" = yes && _def_libavcodec='#define USE_LIBAVCODEC_SO 1'
 test "$_libavcodec_mpegaudio_hp" = yes \
   && _def_libavcodec_mpegaudio_hp='#define CONFIG_MPEGAUDIO_HP 1'
@@ -6258,9 +6259,11 @@ EOF
 fi
 _libavformat=no
 _def_libavformat='#undef USE_LIBAVFORMAT'
+_def_libavformat_a='#undef USE_LIBAVFORMAT_A'
 _def_libavformat_so='#undef USE_LIBAVFORMAT_SO'
 test "$_libavformat_a" = yes || test "$_libavformat_so" = yes && _libavformat=yes
-test "$_libavformat_a"  = yes && _def_libavformat='#define USE_LIBAVFORMAT 1'
+test "$_libavformat"    = yes && _def_libavformat='#define USE_LIBAVFORMAT 1'
+test "$_libavformat_a"  = yes && _def_libavformat='#define USE_LIBAVFORMAT_A 1'
 test "$_libavformat_so" = yes \
   && _def_libavformat_so='#define USE_LIBAVFORMAT_SO 1'
 fi
@@ -6289,9 +6292,11 @@ EOF
 fi
 _libpostproc=no
 _def_libpostproc='#undef USE_LIBPOSTPROC'
+_def_libpostproc_a='#undef USE_LIBPOSTPROC_A'
 _def_libpostproc_so='#undef USE_LIBPOSTPROC_SO'
 test "$_libpostproc_a" = yes || test "$_libpostproc_so" = yes && _libpostproc=yes
-test "$_libpostproc_a"  = yes && _def_libpostproc='#define USE_LIBPOSTPROC 1'
+test "$_libpostproc"    = yes && _def_libpostproc='#define USE_LIBPOSTPROC 1'
+test "$_libpostproc_a"  = yes && _def_libpostproc='#define USE_LIBPOSTPROC_A 1'
 test "$_libpostproc_so" = yes \
   && _def_libpostproc_so='#define USE_LIBPOSTPROC_SO 1'
 echores "$_libpostproc"
@@ -8061,6 +8066,7 @@ $_def_dvdnav_version
 
 /* Define this to enable image postprocessing in libavcodec (requires a FAST CPU!) */
 $_def_libpostproc
+$_def_libpostproc_a
 $_def_libpostproc_so
 
 /* Win32 DLL support */
@@ -8078,15 +8084,17 @@ $_def_win32_loader
 
 /* ffmpeg's libavcodec support (requires libavcodec source) */
 $_def_libavcodec
+$_def_libavcodec_a
 $_def_libavcodec_so
-$_def_lavc_dsputil
 $_def_libavcodec_mpegaudio_hp
 
 /* ffmpeg's libavformat support (requires libavformat source) */
 $_def_libavformat
+$_def_libavformat_a
 $_def_libavformat_so
 
 $_def_libavutil
+$_def_libavutil_a
 $_def_libavutil_so
 
 /* Use libavcodec's decoders */

Modified: trunk/libmpcodecs/vf.c
==============================================================================
--- trunk/libmpcodecs/vf.c	(original)
+++ trunk/libmpcodecs/vf.c	Thu Apr 26 15:20:18 2007
@@ -168,7 +168,7 @@ static vf_info_t* filter_list[]={
     &vf_info_delogo,
     &vf_info_remove_logo,
     &vf_info_hue,
-#ifdef USE_LIBAVCODEC_DSPUTIL
+#ifdef USE_LIBAVCODEC_A
     &vf_info_spp,
     &vf_info_uspp,
     &vf_info_fspp,