aboutsummaryrefslogtreecommitdiffhomepage
path: root/.gitignore
diff options
context:
space:
mode:
authorGravatar Uoti Urpala <uau@symbol.nonexistent.invalid>2008-04-27 14:54:57 +0300
committerGravatar Uoti Urpala <uau@symbol.nonexistent.invalid>2008-04-28 12:16:12 +0300
commit5c2583a0ee9a6e824bb1633748c1899bc99a695c (patch)
treebcbe0a0268049ac38ded39f74ee851f5b12dcb20 /.gitignore
parent2faffe2a7f4076beb461c34428d42b13e0414283 (diff)
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/.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
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