Merge remote-tracking branch 'qatar/master'

[ffmpeg] / .gitignore

diff --git a/.gitignore b/.gitignore
index 19dbe88ff6a2d10c3da1f34e02cd161f3d59c24a..5bf3341ee8fafd20e500933cfeb50348f87cf7b9 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -12,12 +12,13 @@
 *.ver
 *-example
 *-test
+*_g
 /.config
 /.version
-/avconv
-/avplay
-/avprobe
-/avserver
+/ffmpeg
+/ffplay
+/ffprobe
+/ffserver
 /config.*
 /version.h
 /doc/*.1
@@ -25,11 +26,18 @@
 /doc/*.pod
 /doc/avoptions_codec.texi
 /doc/avoptions_format.texi
+/doc/examples/decoding_encoding
+/doc/examples/filtering_audio
+/doc/examples/filtering_video
+/doc/examples/metadata
+/doc/examples/muxing
+/doc/fate.txt
 /doc/print_options
 /doxy/
 /libavcodec/*_tablegen
 /libavcodec/*_tables.c
 /libavcodec/*_tables.h
+/libavcodec/codec_names.h
 /libavutil/avconfig.h
 /tests/audiogen
 /tests/base64
@@ -39,7 +47,10 @@
 /tests/videogen
 /tests/vsynth1/
 /tools/aviocat
+/tools/ffbisect
+/tools/bisect.need
 /tools/cws2fws
+/tools/ffeval
 /tools/graph2dot
 /tools/ismindex
 /tools/pktdumper