summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorClément Bœsch <u@pkh.me>2017-05-03 12:51:48 +0200
committerClément Bœsch <u@pkh.me>2017-05-03 16:49:12 +0200
commit3f17751eeb7e3348576e2597884d5e5155aadcfb (patch)
tree63d0f773c095f4293f6b35c317df964c6d0f69d5 /.gitignore
parentc3e08544100cdd7045f710bfcea33e07d9fcd25b (diff)
parent11a9320de54759340531177c9f2b1e31e6112cc2 (diff)
downloadffmpeg-streaming-3f17751eeb7e3348576e2597884d5e5155aadcfb.zip
ffmpeg-streaming-3f17751eeb7e3348576e2597884d5e5155aadcfb.tar.gz
Merge commit '11a9320de54759340531177c9f2b1e31e6112cc2'
* commit '11a9320de54759340531177c9f2b1e31e6112cc2': build: Move build-system-related helper files to a separate subdirectory "ffbuild" directory name is used instead of "avbuild". Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 524fb73..177c0f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,7 +27,8 @@
/ffplay
/ffprobe
/ffserver
-/config.*
+/config.asm
+/config.h
/coverage.info
/avversion.h
/lcov/
OpenPOWER on IntegriCloud