changeset 2496:b2ce5d6d7d4f

libffmpeg.so support

--- a/configure	Fri Oct 26 22:14:19 2001 +0000
+++ b/configure	Sat Oct 27 13:39:12 2001 +0000
@@ -571,6 +571,7 @@
 _fastmemcpy=yes
 _streaming=no
 _libavcodec=no
+_libavcodec_so=no
 _kernelextcheck=yes
 
 _x=1
@@ -638,14 +639,18 @@
     _libavcodec=yes
 fi
 
+#Checking for libffmpeg.so
+cat > $TMPC << EOF
+#include <libffmpeg/avcodec.h>
+int main( void ) { return 0; }
+EOF
+cc_check $_extraincdir $_extralibdir -lffmpeg && _libavcodec_so=yes
 
 if test -c /dev/mga_vid ; then
  _mga=yes
  _syncfb=yes
 fi
 
-
-
 case "$host_arch" in
 i386)
     _arch="#define ARCH_X86 1"
@@ -1767,6 +1772,7 @@
 fi
 
 echo "Checking for libavcodec ... $_libavcodec"
+echo "Checking for libffmpeg.so ... $_libavcodec_so"
 echo "Checking for divx4linux ... $_divx4linux"
 echo "Checking for fastmemcpy ... $_fastmemcpy"
 echo "Extra libs : $_extralibdir"
@@ -1907,10 +1913,19 @@
    _lavclib='-Llibavcodec -lavcodec'
    _lavcdep='libavcodec/libavcodec.a'
    _libavcodec='#define USE_LIBAVCODEC'
+   _libavcodecso='#undef USE_LIBAVCODEC'
 else
-   _lavclib=''
-   _lavcdep=''
-   _libavcodec='#undef USE_LIBAVCODEC'
+   if test "$_libavcodec_so" = yes ; then
+      _lavclib='-lffmpeg'
+      _lavcdep=''
+      _libavcodec='#define USE_LIBAVCODEC'
+      _libavcodecso='#define USE_LIBAVCODEC_SO'
+   else
+      _lavclib=''
+      _lavcdep=''
+      _libavcodec='#undef USE_LIBAVCODEC'
+      _libavcodecso='#undef USE_LIBAVCODEC'
+   fi
 fi
 
 if test "$_fastmemcpy" = yes ; then
@@ -2548,6 +2563,7 @@
 
 /* ffmpeg's libavcodec support (requires libavcodec source) */
 $_libavcodec
+$_libavcodecso
 /* use only decoders from libavcodec: */
 #define CONFIG_DECODERS
 

--- a/dec_audio.c	Fri Oct 26 22:14:19 2001 +0000
+++ b/dec_audio.c	Sat Oct 27 13:39:12 2001 +0000
@@ -59,7 +59,11 @@
 #endif
 
 #ifdef USE_LIBAVCODEC
+#ifdef USE_LIBAVCODEC_SO
+#include <libffmpeg/avcodec.h>
+#else
 #include "libavcodec/avcodec.h"
+#endif
     static AVCodec *lavc_codec=NULL;
     static AVCodecContext lavc_context;
     extern int avcodec_inited;

--- a/dec_video.c	Fri Oct 26 22:14:19 2001 +0000
+++ b/dec_video.c	Sat Oct 27 13:39:12 2001 +0000
@@ -51,7 +51,11 @@
 #endif
 
 #ifdef USE_LIBAVCODEC
+#ifdef USE_LIBAVCODEC_SO
+#include <libffmpeg/avcodec.h>
+#else
 #include "libavcodec/avcodec.h"
+#endif
     static AVCodec *lavc_codec=NULL;
     static AVCodecContext lavc_context;
     static AVPicture lavc_picture;

--- a/libvo/vo_mpegpes.c	Fri Oct 26 22:14:19 2001 +0000
+++ b/libvo/vo_mpegpes.c	Sat Oct 27 13:39:12 2001 +0000
@@ -50,8 +50,11 @@
 
 #ifdef USE_LIBAVCODEC
 
+#ifdef USE_LIBAVCODEC_SO
+#include <libffmpeg/avcodec.h>
+#else
 #include "../libavcodec/avcodec.h"
-
+#endif
 static unsigned char *picture_buf=NULL;
 static unsigned char *outbuf=NULL;
 static int outbuf_size = 100000;