From 0ea721f7ce81357bc4ec6eea609cd50482c3d15b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Sat, 2 Dec 2006 01:19:48 +0000 Subject: Start working on a branch where FFmpeg is not copied, patched and carved to be built with automake but instead imported inline and built using its own build system. This is an import of a slightly modified FFmpeg current tree. xine-lib builds, install and run fine with it, but there are of course plenty of things that needs to be fixed before it can even be considered for a 1.2.x series. Work will continue in the next days of course. CVS patchset: 8397 CVS date: 2006/12/02 01:19:48 --- src/libffmpeg/libavcodec/mlib/Makefile.am | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 src/libffmpeg/libavcodec/mlib/Makefile.am (limited to 'src/libffmpeg/libavcodec/mlib/Makefile.am') diff --git a/src/libffmpeg/libavcodec/mlib/Makefile.am b/src/libffmpeg/libavcodec/mlib/Makefile.am deleted file mode 100644 index ed8b3c8d0..000000000 --- a/src/libffmpeg/libavcodec/mlib/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -include $(top_srcdir)/misc/Makefile.common - -AM_CPPFLAGS = $(LIBFFMPEG_CPPFLAGS) -I$(top_srcdir)/src/libffmpeg/libavutil -AM_CFLAGS = -fno-strict-aliasing -ASFLAGS = - -noinst_LTLIBRARIES = libavcodec_mlib.la - -libavcodec_mlib_src = dsputil_mlib.c -libavcodec_mlib_dummy = libavcodec_mlib_dummy.c - -EXTRA_DIST = $(libavcodec_mlib_src) $(libavcodec_mlib_dummy) - -if HAVE_MLIB -mlib_modules = $(libavcodec_mlib_src) -endif - -libavcodec_mlib_la_SOURCES = $(mlib_modules) $(libavcodec_mlib_dummy) -- cgit v1.2.3