Merge commit 'c34df422628e6b7b657faee241fe7bb2629e0f57'
[ffmpeg.git] / .gitignore
index 480fbe0..93b0dca 100644 (file)
@@ -1,5 +1,6 @@
 *.a
 *.o
+*.o.*
 *.d
 *.def
 *.dll
@@ -20,6 +21,8 @@
 *-example
 *-test
 *_g
+\#*
+.\#*
 /.config
 /.version
 /ffmpeg
@@ -28,6 +31,7 @@
 /ffserver
 /config.*
 /coverage.info
+/avversion.h
 /doc/*.1
 /doc/*.3
 /doc/*.html
@@ -36,6 +40,7 @@
 /doc/avoptions_codec.texi
 /doc/avoptions_format.texi
 /doc/doxy/html/
+/doc/examples/avio_dir_cmd
 /doc/examples/avio_reading
 /doc/examples/decoding_encoding
 /doc/examples/demuxing_decoding
 /libavutil/ffversion.h
 /tests/audiogen
 /tests/base64
+/tests/checkasm/checkasm
 /tests/data/
 /tests/pixfmts.mak
 /tests/rotozoom
+/tests/test_copy.ffmeta
 /tests/tiny_psnr
 /tests/tiny_ssim
 /tests/videogen
@@ -82,6 +89,7 @@
 /tools/pktdumper
 /tools/probetest
 /tools/qt-faststart
+/tools/sidxindex
 /tools/trasher
 /tools/seek_print
 /tools/uncoded_frame