New configure option --with-external-ffmpeg[=PREFIX].

CVS patchset: 6865
CVS date: 2004/07/31 18:57:45

5 files changed, 22 insertions, 12 deletions

diff --git a/src/libffmpeg/Makefile.am b/src/libffmpeg/Makefile.am
index afe9fe713..0599d5890 100644
--- a/src/libffmpeg/Makefile.am
+++ b/src/libffmpeg/Makefile.am
@@ -1,6 +1,17 @@
 include $(top_srcdir)/misc/Makefile.common
 
-SUBDIRS = libavcodec 
+if HAVE_FFMPEG
+FF_CFLAGS = $(FFMPEG_CFLAGS)
+link_ffmpeg = $(FFMPEG_LIBS)
+else
+FF_CFLAGS = -I$(srcdir)/libavcodec -I$(srcdir)/libavcodec/libpostproc
+link_ffmpeg = \
+  $(top_builddir)/src/libffmpeg/libavcodec/libavcodec.la \
+  $(top_builddir)/src/libffmpeg/libavcodec/libpostproc/libpostprocess.la
+subdir_ffmpeg = libavcodec
+endif
+
+SUBDIRS = $(subdir_ffmpeg)
 
 # this must always be included, even if the current machine has no DXR3...
 EXTRA_DIST = xine_encoder.c diff_to_ffmpeg_cvs.txt
@@ -12,7 +23,7 @@ libdir = $(XINE_PLUGINDIR)
 lib_LTLIBRARIES = xineplug_decode_ff.la xineplug_decode_dvaudio.la
 
 if HAVE_DXR3
-AM_CPPFLAGS = -I$(top_srcdir)/src/dxr3 $(X_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/src/dxr3 $(X_CFLAGS) $(FF_CFLAGS)
 xineplug_decode_ff_la_SOURCES = xine_decoder.c audio_decoder.c video_decoder.c \
                                 xine_encoder.c mpeg_parser.c
 # The dxr3 uses ffmpegs MPEG encoder by dlopen()ing the ffmpeg plugin and
@@ -25,8 +36,7 @@ xineplug_decode_ff_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 endif
 
 xineplug_decode_ff_la_LIBADD = $(MLIB_LIBS) $(XINE_LIB) -lm $(ZLIB_LIBS) \
-	$(top_builddir)/src/libffmpeg/libavcodec/libavcodec.la \
-	$(top_builddir)/src/libffmpeg/libavcodec/libpostproc/libpostprocess.la
+	$(link_ffmpeg)
 
 xineplug_decode_dvaudio_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 xineplug_decode_dvaudio_la_SOURCES = dvaudio_decoder.c
diff --git a/src/libffmpeg/dvaudio_decoder.c b/src/libffmpeg/dvaudio_decoder.c
index 56538d2e1..4b4420ba5 100644
--- a/src/libffmpeg/dvaudio_decoder.c
+++ b/src/libffmpeg/dvaudio_decoder.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: dvaudio_decoder.c,v 1.2 2004/03/17 17:03:26 storri Exp $
+ * $Id: dvaudio_decoder.c,v 1.3 2004/07/31 18:57:45 valtri Exp $
  *
  * dv audio decoder based on patch by Dan Dennedy <dan@dennedy.org>
  *
@@ -56,7 +56,7 @@
 #  undef uint64_t
 #endif
 
-#include "libavcodec/avcodec.h"
+#include <avcodec.h>
 #include "libavcodec/dvdata.h"
 
 #ifdef _MSC_VER
diff --git a/src/libffmpeg/video_decoder.c b/src/libffmpeg/video_decoder.c
index c1e698380..8cff6acff 100644
--- a/src/libffmpeg/video_decoder.c
+++ b/src/libffmpeg/video_decoder.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_decoder.c,v 1.24 2004/07/30 19:08:48 miguelfreitas Exp $
+ * $Id: video_decoder.c,v 1.25 2004/07/31 18:57:45 valtri Exp $
  *
  * xine video decoder plugin using ffmpeg
  *
@@ -47,7 +47,7 @@
 #include "xine_decoder.h"
 #include "mpeg_parser.h"
 
-#include "libavcodec/libpostproc/postprocess.h"
+#include <postprocess.h>
 
 #define VIDEOBUFSIZE        (128*1024)
 #define SLICE_BUFFER_SIZE   (1194*1024)
diff --git a/src/libffmpeg/xine_decoder.h b/src/libffmpeg/xine_decoder.h
index d96180702..91d32bff7 100644
--- a/src/libffmpeg/xine_decoder.h
+++ b/src/libffmpeg/xine_decoder.h
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine_decoder.h,v 1.1 2004/01/31 01:19:17 jstembridge Exp $
+ * $Id: xine_decoder.h,v 1.2 2004/07/31 18:57:45 valtri Exp $
  *
  */
  
@@ -36,7 +36,7 @@
 #  undef uint64_t
 #endif
 
-#include "libavcodec/avcodec.h"
+#include <avcodec.h>
 
 #ifdef _MSC_VER
 #  undef malloc
diff --git a/src/libffmpeg/xine_encoder.c b/src/libffmpeg/xine_encoder.c
index 8d6d72195..07bf9b8fa 100644
--- a/src/libffmpeg/xine_encoder.c
+++ b/src/libffmpeg/xine_encoder.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine_encoder.c,v 1.16 2004/07/20 16:37:45 mroi Exp $
+ * $Id: xine_encoder.c,v 1.17 2004/07/31 18:57:45 valtri Exp $
  */
  
 /* mpeg encoders for the dxr3 video out plugin. */
@@ -34,7 +34,7 @@
 /* #define LOG */
 
 #include "video_out_dxr3.h"
-#include "libavcodec/avcodec.h"
+#include <avcodec.h>
 
 /* buffer size for encoded mpeg1 stream; will hold one intra frame 
  * at 640x480 typical sizes are <50 kB. 512 kB should be plenty */