Merge commit 'dc574658d15ad8f171dbdecbdce7197acf9424a0'

[ffmpeg] / .gitignore

diff --git a/.gitignore b/.gitignore
index 000f149c4e84eb33b9c8da18a0017e6fac56ec4e..979d6179ae0fc88362a2b991f07c11657a8aec7d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 *.d
 *.def
 *.dll
+*.dylib
 *.exe
 *.exp
 *.gcda
@@ -17,20 +18,33 @@
 *.ver
 *-example
 *-test
+*_g
 /.config
 /.version
-/avconv
-/avplay
-/avprobe
-/avserver
+/ffmpeg
+/ffplay
+/ffprobe
+/ffserver
 /config.*
 /coverage.info
 /version.h
 /doc/*.1
+/doc/*.3
 /doc/*.html
 /doc/*.pod
+/doc/config.texi
 /doc/avoptions_codec.texi
 /doc/avoptions_format.texi
+/doc/examples/decoding_encoding
+/doc/examples/demuxing
+/doc/examples/filtering_audio
+/doc/examples/filtering_video
+/doc/examples/metadata
+/doc/examples/muxing
+/doc/examples/pc-uninstalled
+/doc/examples/resampling_audio
+/doc/examples/scaling_video
+/doc/fate.txt
 /doc/doxy/html/
 /doc/print_options
 /lcov/
@@ -43,13 +57,20 @@
 /tests/data/
 /tests/rotozoom
 /tests/tiny_psnr
+/tests/tiny_ssim
 /tests/videogen
 /tests/vsynth1/
 /tools/aviocat
+/tools/ffbisect
+/tools/bisect.need
 /tools/cws2fws
+/tools/fourcc2pixfmt
+/tools/ffescape
+/tools/ffeval
 /tools/graph2dot
 /tools/ismindex
 /tools/pktdumper
 /tools/probetest
 /tools/qt-faststart
 /tools/trasher
+/tools/seek_print