From 5c2583a0ee9a6e824bb1633748c1899bc99a695c Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Sun, 27 Apr 2008 14:54:57 +0300 Subject: Make MPlayer build with a complete FFmpeg checkout in ffmpeg/ Instead of separate checkouts of the FFmpeg libavutil/, libavcodec/, libavformat/, libpostproc/ subdirectories make MPlayer build with a complete checkout of FFmpeg under ffmpeg/. configure now creates config.mak and config.h at both the top level and in ffmpeg/. The config.h files are identical. The config.mak for FFmpeg has different include paths. The top-level common.mak and subdir.mak are now used by libswscale only; the directories under ffmpeg/ use the versions in ffmpeg/. --- .gitignore | 1 + 1 file changed, 1 insertion(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 69977f11c6..411891e554 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ *.d .depend +/ffmpeg /config.h /config.mak /configure.log -- cgit v1.2.3