Merge remote-tracking branch 'qatar/master'
[ffmpeg.git] / .gitignore
index 2c3b047..d27b3bd 100644 (file)
@@ -22,6 +22,9 @@ ffplay
 ffprobe
 ffserver
 avconv
+doc/avoptions_codec.texi
+doc/avoptions_format.texi
+doc/print_options
 libavcodec/*_tablegen
 libavcodec/*_tables.c
 libavcodec/*_tables.h