Merge remote-tracking branch 'qatar/master'

[ffmpeg] / .gitignore

diff --git a/.gitignore b/.gitignore
index 833ae7911b90d35e553dac474abe5ff5c959ab07..2c3b047695f04d02ddc88654b5339827ea1a27fe 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@ config.*
 doc/*.1
 doc/*.html
 doc/*.pod
+doc/fate.txt
 doxy
 ffmpeg
 ffplay
@@ -43,8 +44,10 @@ tests/tiny_psnr
 tests/videogen
 tests/vsynth1
 tests/vsynth2
+tools/aviocat
 tools/cws2fws
 tools/graph2dot
+tools/ismindex
 tools/lavfi-showfiltfmts
 tools/pktdumper
 tools/probetest