Merge remote-tracking branch 'qatar/master'

[ffmpeg] / .gitignore

diff --git a/.gitignore b/.gitignore
index 46d2d67c02d49c1df91ba1e26d555a94497a69b5..138f076e407b4a80272bc49e5dfc806fe05cfd80 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,11 @@
 *.a
 *.o
 *.d
+*.def
+*.dll
 *.exe
 *.ho
+*.lib
 *.pc
 *.so
 *.so.*
@@ -30,6 +33,11 @@ avconv
 doc/avoptions_codec.texi
 doc/avoptions_format.texi
 doc/print_options
+doc/examples/decoding_encoding
+doc/examples/filtering_audio
+doc/examples/filtering_video
+doc/examples/metadata
+doc/examples/muxing
 libavcodec/*_tablegen
 libavcodec/*_tables.c
 libavcodec/*_tables.h
@@ -45,6 +53,7 @@ tests/vsynth1
 tests/vsynth2
 tools/aviocat
 tools/cws2fws
+tools/ffeval
 tools/graph2dot
 tools/ismindex
 tools/lavfi-showfiltfmts