Merge commit 'c34df422628e6b7b657faee241fe7bb2629e0f57'
[ffmpeg.git] / .gitignore
index 0b00f07..93b0dca 100644 (file)
@@ -1,11 +1,14 @@
 *.a
 *.o
+*.o.*
 *.d
 *.def
 *.dll
 *.dylib
 *.exe
 *.exp
+*.gcda
+*.gcno
 *.h.c
 *.ilk
 *.lib
 *.pdb
 *.so
 *.so.*
+*.swp
 *.ver
 *-example
 *-test
 *_g
+\#*
+.\#*
 /.config
 /.version
 /ffmpeg
 /ffprobe
 /ffserver
 /config.*
-/version.h
+/coverage.info
+/avversion.h
 /doc/*.1
+/doc/*.3
 /doc/*.html
 /doc/*.pod
+/doc/config.texi
 /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
+/doc/examples/demuxing_decoding
+/doc/examples/extract_mvs
+/doc/examples/filter_audio
 /doc/examples/filtering_audio
 /doc/examples/filtering_video
 /doc/examples/metadata
 /doc/examples/muxing
+/doc/examples/pc-uninstalled
+/doc/examples/remuxing
+/doc/examples/resampling_audio
 /doc/examples/scaling_video
+/doc/examples/transcode_aac
+/doc/examples/transcoding
 /doc/fate.txt
 /doc/print_options
-/doxy/
+/lcov/
 /libavcodec/*_tablegen
 /libavcodec/*_tables.c
 /libavcodec/*_tables.h
 /libavutil/avconfig.h
+/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
 /tests/vsynth1/
 /tools/aviocat
 /tools/ffbisect
 /tools/bisect.need
+/tools/crypto_bench
 /tools/cws2fws
+/tools/fourcc2pixfmt
+/tools/ffescape
 /tools/ffeval
+/tools/ffhash
 /tools/graph2dot
 /tools/ismindex
 /tools/pktdumper
 /tools/probetest
 /tools/qt-faststart
+/tools/sidxindex
 /tools/trasher
+/tools/seek_print
+/tools/uncoded_frame
+/tools/zmqsend