diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2006-12-02 01:19:48 +0000 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2006-12-02 01:19:48 +0000 |
| commit | 0ea721f7ce81357bc4ec6eea609cd50482c3d15b (patch) | |
| tree | 25a0871cb3c06f9716acf9c204192d548f214048 /configure.ac | |
| parent | d8ec380876e7f697ba609546d61757ab3f2d8715 (diff) | |
| download | xine-lib-0ea721f7ce81357bc4ec6eea609cd50482c3d15b.tar.gz xine-lib-0ea721f7ce81357bc4ec6eea609cd50482c3d15b.tar.bz2 | |
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
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index f654e91d4..06ef24d84 100644 --- a/configure.ac +++ b/configure.ac @@ -2404,6 +2404,8 @@ doc/man/Makefile doc/man/en/Makefile doc/hackersguide/Makefile doc/faq/Makefile +contrib/Makefile +contrib/ffmpeg/makefile.xine include/Makefile include/xine.h lib/Makefile @@ -2438,15 +2440,6 @@ src/libdts/Makefile src/libfaad/Makefile src/libfaad/codebook/Makefile src/libffmpeg/Makefile -src/libffmpeg/libavcodec/Makefile -src/libffmpeg/libavcodec/armv4l/Makefile -src/libffmpeg/libavcodec/i386/Makefile -src/libffmpeg/libavcodec/mlib/Makefile -src/libffmpeg/libavcodec/alpha/Makefile -src/libffmpeg/libavcodec/ppc/Makefile -src/libffmpeg/libavcodec/sparc/Makefile -src/libffmpeg/libavcodec/libpostproc/Makefile -src/libffmpeg/libavutil/Makefile src/libflac/Makefile src/liblpcm/Makefile src/libmad/Makefile |