[Drdivx-commits] SF.net SVN: drdivx: [611] DrDivX/trunk/drffmpeg

[<ro...@us...>]

Revision: 611
          http://svn.sourceforge.net/drdivx/?rev=611&view=rev
Author:   robux4
Date:     2006-10-10 12:27:35 -0700 (Tue, 10 Oct 2006)

Log Message:
-----------
use libavdsp when USE_LIBAVDSP is set in config.h

Modified Paths:
--------------
    DrDivX/trunk/drffmpeg/drffmpeg.c
    DrDivX/trunk/drffmpeg/drffmpeg.proj
    DrDivX/trunk/drffmpeg/libavcodec/i386/fft_sse.c
    DrDivX/trunk/drffmpeg/libavcodec/libavcodec.proj

Modified: DrDivX/trunk/drffmpeg/drffmpeg.c
===================================================================
--- DrDivX/trunk/drffmpeg/drffmpeg.c	2006-10-10 19:07:16 UTC (rev 610)
+++ DrDivX/trunk/drffmpeg/drffmpeg.c	2006-10-10 19:27:35 UTC (rev 611)
@@ -32,6 +32,9 @@
 #if defined(CONFIG_WIN32)
 	CoInitializeEx(NULL, COINIT_MULTITHREADED);
 #endif
+#ifdef HAVE_LIBAVDSP
+    avdsp_init();
+#endif
 	return 0;
 }
 

Modified: DrDivX/trunk/drffmpeg/drffmpeg.proj
===================================================================
--- DrDivX/trunk/drffmpeg/drffmpeg.proj	2006-10-10 19:07:16 UTC (rev 610)
+++ DrDivX/trunk/drffmpeg/drffmpeg.proj	2006-10-10 19:27:35 UTC (rev 611)
@@ -9,6 +9,7 @@
   
   DEFINE HAVE_AV_CONFIG_H
   DEFINE(COMPILER_GCC && TARGET_WIN32) "__MSVCRT_VERSION__=0x0700"
+  DEFINE(USE_LIBAVDSP) HAVE_LIBAVDSP
 
   SOURCE drffmpeg.c
   SOURCE(TARGET_WIN32) drffmpeg.rc

Modified: DrDivX/trunk/drffmpeg/libavcodec/i386/fft_sse.c
===================================================================
--- DrDivX/trunk/drffmpeg/libavcodec/i386/fft_sse.c	2006-10-10 19:07:16 UTC (rev 610)
+++ DrDivX/trunk/drffmpeg/libavcodec/i386/fft_sse.c	2006-10-10 19:27:35 UTC (rev 611)
@@ -42,7 +42,7 @@
 #endif
 
 /* XXX: handle reverse case */
-void ff_fft_calc_sse(FFTContext *s, FFTComplex *z)
+HAVE_LIBAVDSP_EXTERN void ff_fft_calc_sse(FFTContext *s, FFTComplex *z)
 {
     int ln = s->nbits;
     int         j, np, np2;

Modified: DrDivX/trunk/drffmpeg/libavcodec/libavcodec.proj
===================================================================
--- DrDivX/trunk/drffmpeg/libavcodec/libavcodec.proj	2006-10-10 19:07:16 UTC (rev 610)
+++ DrDivX/trunk/drffmpeg/libavcodec/libavcodec.proj	2006-10-10 19:27:35 UTC (rev 611)
@@ -5,6 +5,7 @@
   DEFINE(COMPILER_GCC && TARGET_WIN32) "__MSVCRT_VERSION__=0x0700"
   DEFINE HAVE_AV_CONFIG_H
   DEFINE(USE_LIBAVDSP) HAVE_LIBAVDSP
+  DEFINE HAVE_BUILTIN_VECTOR
 
   INCLUDE(COMPILER_MSVC) ../export/drffmpeg/msvc
   INCLUDE(!COMPILER_MSVC) ../
@@ -47,6 +48,7 @@
   DEFINE HAVE_AV_CONFIG_H
 //  CFLAG(COMPILER_GCC && TARGET_WIN32) "-include ../import/include/baseclasses/mingw.h"
   DEFINE(COMPILER_GCC && TARGET_WIN32) "__MSVCRT_VERSION__=0x0700"
+  DEFINE(COMPILER_GCC) HAVE_BUILTIN_VECTOR
 
   SOURCE(TARGET_WIN32) ../dshow/wmvdmo.c
   SOURCE(TARGET_WIN32) ../dshow/AacSourceCallBack.cpp
@@ -269,28 +271,18 @@
   INCLUDE ../import/include
   INCLUDE ../import/include/zlib
 
-//  LIBS_RELEASE(COMPILER_MSVC) strmbase.lib
-//  LIBS_DEBUG(COMPILER_MSVC) strmbasd.lib
-//  LIBS(COMPILER_MSVC) libmp3lame.lib
-//  LIBS(COMPILER_MSVC) mpglib.lib
-  LIBS(COMPILER_MSVC) msdmo.lib
-  LIBS(COMPILER_MSVC) dmoguids.lib
+  LIBS(TARGET_WIN32) msdmo.lib
+  LIBS(TARGET_WIN32) dmoguids.lib
   LIBS(COMPILER_MSVC) zlib.lib
-  LIBS(COMPILER_GCC && TARGET_WIN32) msdmo
-  LIBS(COMPILER_GCC && TARGET_WIN32) dmoguids
+  LIBS(COMPILER_gcc) z
 
-//  LIBINCLUDE_DEBUG(COMPILER_MSVC) ../import/lib/debug/baseclasses
-//  LIBINCLUDE_DEBUG(COMPILER_MSVC) ../import/lib/debug/directxsdk
-//  LIBINCLUDE_DEBUG(COMPILER_MSVC) ../import/lib/debug/lame
   LIBINCLUDE_DEBUG(COMPILER_MSVC) ../import/lib/debug/zlib
-//  LIBINCLUDE_RELEASE(COMPILER_MSVC) ../import/lib/release/baseclasses
-//  LIBINCLUDE_RELEASE(COMPILER_MSVC) ../import/lib/release/directxsdk
-//  LIBINCLUDE_RELEASE(COMPILER_MSVC) ../import/lib/release/lame
   LIBINCLUDE_RELEASE(COMPILER_MSVC) ../import/lib/release/zlib
 }
 
 LIB avcodec
 {
   USE avcodecbase
-  USE avdsp
+  USE(USE_LIBAVDSP) libavdsp
+  USE(!USE_LIBAVDSP) avdsp
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.