Merge remote-tracking branch 'qatar/master'

[ffmpeg] / .gitignore

diff --git a/.gitignore b/.gitignore
index 0303bde016d74e61ecceb7712e4129093ddf52fe..138f076e407b4a80272bc49e5dfc806fe05cfd80 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -33,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