Remove internal FFmpeg reference from build system.

10 files changed, 4 insertions, 44 deletions

diff --git a/misc/Makefile.common b/misc/Makefile.common
index 96c981ee3..edafcea4b 100644
--- a/misc/Makefile.common
+++ b/misc/Makefile.common
@@ -14,9 +14,6 @@ $(XINE_LIB):
 $(top_builddir)/contrib/libxdg-basedir/libxdg-basedir.la:
 	$(MAKE) -C $(top_builddir)/contrib/libxdg-basedir
 
-$(top_builddir)/contrib/ffmpeg/libavutil/libavutil.a:
-	$(MAKE) -C $(top_builddir)/contrib/ ffmpeg/libavutil/libavutil.a
-
 install-data-hook:
 	@if test $$MAKELEVEL -le 4 ; then \
 	  if test -x "$(top_srcdir)/post-install.sh" ; then \
diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am
index 7e4f1db3a..595783f88 100644
--- a/src/demuxers/Makefile.am
+++ b/src/demuxers/Makefile.am
@@ -61,7 +61,6 @@ xineplug_dmx_avi_la_LIBADD = $(XINE_LIB) $(LTLIBINTL)
 xineplug_dmx_mpeg_block_la_SOURCES = demux_mpeg_block.c
 xineplug_dmx_mpeg_block_la_CFLAGS = $(AM_CFLAGS) $(AVUTIL_CFLAGS)
 xineplug_dmx_mpeg_block_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) $(AVUTIL_LIBS)
-xineplug_dmx_mpeg_block_la_DEPS = $(AVUTIL_DEPS)
 
 xineplug_dmx_mpeg_la_SOURCES = demux_mpeg.c
 xineplug_dmx_mpeg_la_LIBADD = $(XINE_LIB)
@@ -72,12 +71,10 @@ xineplug_dmx_mpeg_elem_la_LIBADD = $(XINE_LIB)
 xineplug_dmx_mpeg_pes_la_SOURCES = demux_mpeg_pes.c
 xineplug_dmx_mpeg_pes_la_CFLAGS = $(AM_CFLAGS) $(AVUTIL_CFLAGS)
 xineplug_dmx_mpeg_pes_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) $(AVUTIL_LIBS)
-xineplug_dmx_mpeg_pes_la_DEPS = $(AVUTIL_DEPS)
 
 xineplug_dmx_mpeg_ts_la_SOURCES = demux_ts.c
 xineplug_dmx_mpeg_ts_la_CFLAGS = $(AM_CFLAGS) $(AVUTIL_CFLAGS)
 xineplug_dmx_mpeg_ts_la_LIBADD = $(XINE_LIB) $(AVUTIL_LIBS)
-xineplug_dmx_mpeg_ts_la_DEPS = $(AVUTIL_DEPS)
 
 xineplug_dmx_qt_la_SOURCES = demux_qt.c
 xineplug_dmx_qt_la_LIBADD = $(XINE_LIB) $(ZLIB_LIBS)
diff --git a/src/dxr3/Makefile.am b/src/dxr3/Makefile.am
index d494f5470..692e82c84 100644
--- a/src/dxr3/Makefile.am
+++ b/src/dxr3/Makefile.am
@@ -45,4 +45,3 @@ xineplug_vo_out_dxr3_la_SOURCES = \
 
 xineplug_vo_out_dxr3_la_CFLAGS = $(AM_CFLAGS) $(AVUTIL_CFLAGS)
 xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_x_libs) $(XINE_LIB) $(LTLIBINTL) $(DYNAMIC_LD_LIBS) $(AVUTIL_LIBS) -lm
-xineplug_vo_out_dxr3_la_DEPS = $(AVUTIL_DEPS)
\ No newline at end of file
diff --git a/src/input/Makefile.am b/src/input/Makefile.am
index 25541cc2c..0abeaaeae 100644
--- a/src/input/Makefile.am
+++ b/src/input/Makefile.am
@@ -106,7 +106,7 @@ xineplug_inp_pnm_la_SOURCES = input_pnm.c net_buf_ctrl.c pnm.c
 xineplug_inp_pnm_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL)
 
 xineplug_inp_dvb_la_SOURCES = input_dvb.c net_buf_ctrl.c
-xineplug_inp_dvb_la_DEPS = $(XDG_BASEDIR_DEPS) $(AVUTIL_DEPS)
+xineplug_inp_dvb_la_DEPS = $(XDG_BASEDIR_DEPS)
 xineplug_inp_dvb_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) $(XDG_BASEDIR_LIBS) $(AVUTIL_LIBS)
 xineplug_inp_dvb_la_CPPFLAGS = $(AM_CPPFLAGS) $(XDG_BASEDIR_CPPFLAGS) $(AVUTIL_CFLAGS)
 
@@ -114,7 +114,7 @@ xineplug_inp_rtsp_la_SOURCES = input_rtsp.c net_buf_ctrl.c
 xineplug_inp_rtsp_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) libreal/libreal.la librtsp/librtsp.la
 
 xineplug_inp_cdda_la_SOURCES = input_cdda.c media_helper.c
-xineplug_inp_cdda_la_DEPS = $(XDG_BASEDIR_DEPS) $(AVUTIL_DEPS)
+xineplug_inp_cdda_la_DEPS = $(XDG_BASEDIR_DEPS)
 xineplug_inp_cdda_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) $(XDG_BASEDIR_LIBS) $(AVUTIL_LIBS)
 xineplug_inp_cdda_la_CPPFLAGS = $(AM_CPPFLAGS) $(XDG_BASEDIR_CPPFLAGS) $(AVUTIL_CFLAGS)
 
diff --git a/src/input/libreal/Makefile.am b/src/input/libreal/Makefile.am
index 74ac41366..0bd002963 100644
--- a/src/input/libreal/Makefile.am
+++ b/src/input/libreal/Makefile.am
@@ -9,4 +9,3 @@ noinst_LTLIBRARIES = libreal.la
 
 libreal_la_SOURCES = real.c asmrp.c rmff.c sdpplin.c
 libreal_la_LIBADD = $(AVUTIL_LIBS)
-libreal_la_DEPS = $(AVUTIL_DEPS)
diff --git a/src/libffmpeg/Makefile.am b/src/libffmpeg/Makefile.am
index 784be31c1..ea900edba 100644
--- a/src/libffmpeg/Makefile.am
+++ b/src/libffmpeg/Makefile.am
@@ -4,25 +4,6 @@ AM_CFLAGS   = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
 AM_CPPFLAGS = $(ZLIB_CPPFLAGS)
 AM_LDFLAGS  = $(xineplug_ldflags)
 
-if !WITH_EXTERNAL_FFMPEG
-
-$(top_builddir)/contrib/ffmpeg/libavcodec/libavcodec.a:
-	$(MAKE) -C $(top_builddir)/contrib/ ffmpeg/libavcodec/libavcodec.a
-
-$(top_builddir)/contrib/ffmpeg/libpostproc/libpostproc.a:
-	$(MAKE) -C $(top_builddir)/contrib/ ffmpeg/libpostproc/libpostproc.a
-
-$(top_builddir)/contrib/ffmpeg/config.h:
-	$(MAKE) -C $(top_builddir)/contrib/ ffmpeg/config.mak
-
-ffmpeg_config.h: $(top_builddir)/contrib/ffmpeg/config.h
-	cp $(top_builddir)/contrib/ffmpeg/config.h ffmpeg_config.h
-
-BUILT_SOURCES = ffmpeg_config.h
-CLEANFILES    = $(BUILT_SOURCES)
-
-endif
-
 # this must always be included, even if the current machine has no DXR3...
 EXTRA_DIST = ffmpeg_encoder.c
 
@@ -44,7 +25,6 @@ nodist_xineplug_decode_ff_la_SOURCES = ffmpeg_config.h
 xineplug_decode_ff_la_CFLAGS = $(AM_CFLAGS) $(FFMPEG_CFLAGS) $(FFMPEG_POSTPROC_CFLAGS)
 xineplug_decode_ff_la_LIBADD = $(MLIB_LIBS) $(XINE_LIB) -lm $(ZLIB_LIBS) \
 	$(FFMPEG_LIBS) $(FFMPEG_POSTPROC_LIBS) $(PTHREAD_LIBS) $(LTLIBINTL)
-xineplug_decode_ff_la_DEPS = $(FFMPEG_DEPS) $(FFMPEG_POSTPROC_DEPS)
 xineplug_decode_ff_la_LDFLAGS = $(AM_LDFLAGS) $(IMPURE_TEXT_LDFLAGS)
 
 xineplug_decode_dvaudio_la_SOURCES  = ff_dvaudio_decoder.c
diff --git a/src/libmpeg2/Makefile.am b/src/libmpeg2/Makefile.am
index 1cf18c325..257c8405a 100644
--- a/src/libmpeg2/Makefile.am
+++ b/src/libmpeg2/Makefile.am
@@ -29,5 +29,4 @@ xineplug_decode_mpeg2_la_SOURCES = \
 	libmpeg2_accel.c
 
 xineplug_decode_mpeg2_la_LIBADD = $(MLIB_LIBS) $(XINE_LIB) $(AVUTIL_LIBS) -lm
-xineplug_decode_mpeg2_la_DEPS = $(AVUTIL_DEPS)
 xineplug_decode_mpeg2_la_CFLAGS = $(AM_CFLAGS) $(MLIB_CFLAGS) $(AVUTIL_CFLAGS)
diff --git a/src/post/planar/Makefile.am b/src/post/planar/Makefile.am
index 68a3953bf..c9a36a001 100644
--- a/src/post/planar/Makefile.am
+++ b/src/post/planar/Makefile.am
@@ -1,17 +1,13 @@
 include $(top_srcdir)/misc/Makefile.common
 
-AM_CFLAGS   = $(VISIBILITY_FLAG) $(ff_cflags)
+AM_CFLAGS   = $(VISIBILITY_FLAG)
 AM_CPPFLAGS = 
 AM_LDFLAGS  = 
 
-$(top_builddir)/contrib/ffmpeg/libpostproc/libpostproc.a:
-	$(MAKE) -C $(top_builddir)/contrib ffmpeg/libpostproc/libpostproc.a
-
 noinst_LTLIBRARIES = libpost_planar_asm.la
 libpost_planar_asm_la_SOURCES = eq.c eq2.c noise.c
 libpost_planar_asm_la_CFLAGS  = $(O1_CFLAGS) -fomit-frame-pointer $(AM_CFLAGS) $(AVUTIL_CFLAGS)
 libpost_planar_asm_la_LIBADD  = $(AVUTIL_LIBS)
-libpost_planar_asm_la_DEPS    = $(AVUTIL_DEPS)
 
 xinepost_LTLIBRARIES = xineplug_post_planar.la
 xineplug_post_planar_la_SOURCES = planar.c invert.c expand.c fill.c boxblur.c \
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am
index aff164494..126a7a1c3 100644
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -96,7 +96,6 @@ noinst_LTLIBRARIES = libyuv2rgb.la
 libyuv2rgb_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c
 libyuv2rgb_la_CFLAGS = $(AM_CFLAGS) $(MLIB_CFLAGS) $(AVUTIL_CFLAGS)
 libyuv2rgb_la_LIBADD = $(XINE_LIB) $(MLIB_LIBS) $(AVUTIL_LIBS)
-libyuv2rgb_la_DEPENDENCIES = $(AVUTIL_DEPS)
 
 xineplug_LTLIBRARIES = $(xshm_module) $(xv_module) $(xvmc_module) \
                   $(opengl_module) \
@@ -117,7 +116,6 @@ xineplug_LTLIBRARIES = $(xshm_module) $(xv_module) $(xvmc_module) \
 
 xineplug_vo_out_xcbshm_la_SOURCES = video_out_xcbshm.c $(XCBOSD)
 xineplug_vo_out_xcbshm_la_LIBADD = libyuv2rgb.la $(XINE_LIB) $(PTHREAD_LIBS) $(XCB_LIBS) $(XCBSHM_LIBS) $(LTLIBINTL) $(AVUTIL_LIBS)
-xineplug_vo_out_xcbshm_la_DEPENDENCIES = $(AVUTIL_DEPS)
 xineplug_vo_out_xcbshm_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS) $(XCBSHM_CFLAGS) $(AVUTIL_CFLAGS)
 
 xineplug_vo_out_xcbxv_la_SOURCES = video_out_xcbxv.c $(XCBOSD)
@@ -127,7 +125,6 @@ xineplug_vo_out_xcbxv_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS) $(XCBXV_CFLAGS)
 xineplug_vo_out_xshm_la_SOURCES = video_out_xshm.c $(X11OSD)
 xineplug_vo_out_xshm_la_LIBADD = libyuv2rgb.la $(X_LIBS) $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) $(AVUTIL_LIBS)
 xineplug_vo_out_xshm_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS) $(AVUTIL_CFLAGS) -fno-strict-aliasing
-xineplug_vo_out_xshm_la_DEPENDENCIES = $(AVUTIL_DEPS)
 
 xineplug_vo_out_xv_la_SOURCES = $(X11OSD) video_out_xv.c
 xineplug_vo_out_xv_la_LIBADD = $(XV_LIBS) $(X_LIBS) $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL)
@@ -145,7 +142,6 @@ xineplug_vo_out_xxmc_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS) $(XV_CFLAGS) -fno-stri
 xineplug_vo_out_opengl_la_SOURCES = video_out_opengl.c myglext.h $(X11OSD)
 xineplug_vo_out_opengl_la_LIBADD = libyuv2rgb.la $(OPENGL_LIBS) $(GLUT_LIBS) \
 	$(GLU_LIBS) $(X_LIBS) $(XINE_LIB) $(PTHREAD_LIBS) $(DYNAMIC_LD_LIBS) $(LTLIBINTL) $(AVUTIL_LIBS)
-xineplug_vo_out_opengl_la_DEPENDENCIES = $(AVUTIL_DEPS)
 xineplug_vo_out_opengl_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS) $(AVUTIL_CFLAGS) -fno-strict-aliasing
 
 xineplug_vo_out_syncfb_la_SOURCES = video_out_syncfb.c 
@@ -171,17 +167,14 @@ xineplug_vo_out_vidix_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/contrib/vid
 
 xineplug_vo_out_aa_la_SOURCES =  video_out_aa.c
 xineplug_vo_out_aa_la_LIBADD = $(AALIB_LIBS) $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) $(AVUTIL_LIBS)
-xineplug_vo_out_aa_la_DEPENDENCIES = $(AVUTIL_DEPS)
 xineplug_vo_out_aa_la_CFLAGS = $(AM_CFLAGS) $(AALIB_CFLAGS) $(AVUTIL_CFLAGS)
 
 xineplug_vo_out_caca_la_SOURCES = video_out_caca.c
 xineplug_vo_out_caca_la_LIBADD = libyuv2rgb.la $(CACA_LIBS) $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) $(AVUTIL_LIBS)
-xineplug_vo_out_caca_la_DEPENDENCIES = $(AVUTIL_DEPS)
 xineplug_vo_out_caca_la_CFLAGS = $(AM_CFLAGS) $(CACA_CFLAGS) $(AVUTIL_CFLAGS)
 
 xineplug_vo_out_fb_la_SOURCES = video_out_fb.c
 xineplug_vo_out_fb_la_LIBADD = libyuv2rgb.la $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) $(AVUTIL_LIBS)
-xineplug_vo_out_fb_la_DEPENDENCIES = $(AVUTIL_DEPS)
 xineplug_vo_out_fb_la_CFLAGS = $(AM_CFLAGS) $(AVUTIL_CFLAGS)
 
 xineplug_vo_out_directfb_la_SOURCES = video_out_directfb.c
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am
index fa53965a3..8b7fc1d63 100644
--- a/src/xine-engine/Makefile.am
+++ b/src/xine-engine/Makefile.am
@@ -33,7 +33,7 @@ libxine_la_SOURCES = xine.c metronom.c configfile.c buffer.c \
 	input_rip.c input_cache.c info_helper.c refcounter.c \
 	alphablend.c
 
-libxine_la_DEPENDENCIES = $(XINEUTILS_LIB) $(XDG_BASEDIR_DEPS) $(AVUTIL_DEPS) \
+libxine_la_DEPENDENCIES = $(XINEUTILS_LIB) $(XDG_BASEDIR_DEPS) \
                           $(pthread_dep) $(LIBXINEPOSIX)
 libxine_la_LIBADD = $(PTHREAD_LIBS) $(DYNAMIC_LD_LIBS) $(LTLIBINTL) $(ZLIB_LIBS) \
 		    -lm $(XINEUTILS_LIB) $(LTLIBICONV) $(FT2_LIBS) $(FONTCONFIG_LIBS) \