Merge commit 'c21d78a903da378af48c9e5f971fe989592ddb65'
[ffmpeg.git] / .gitignore
index 0d8f1fb..524fb73 100644 (file)
@@ -1,5 +1,6 @@
 *.a
 *.o
+*.o.*
 *.d
 *.def
 *.dll
 *.so.*
 *.swp
 *.ver
-*-test
+*_g
+\#*
+.\#*
 /.config
 /.version
-/avconv
-/avplay
-/avprobe
+/ffmpeg
+/ffplay
+/ffprobe
+/ffserver
 /config.*
 /coverage.info
 /avversion.h
-/doc/*.1
-/doc/*.html
-/doc/*.pod
-/doc/avoptions_codec.texi
-/doc/avoptions_format.texi
-/doc/doxy/html/
-/doc/examples/avcodec
-/doc/examples/filter_audio
-/doc/examples/metadata
-/doc/examples/output
-/doc/examples/transcode_aac
-/doc/print_options
 /lcov/
-/libavformat/protocol_list.c
-/libavcodec/*_tablegen
-/libavcodec/*_tables.c
-/libavcodec/*_tables.h
-/libavcodec/bsf_list.c
-/libavutil/avconfig.h
-/tests/audiogen
-/tests/base64
-/tests/checkasm/checkasm
-/tests/data/
-/tests/pixfmts.mak
-/tests/rotozoom
-/tests/tiny_psnr
-/tests/videogen
-/tests/vsynth1/
-/tools/aviocat
-/tools/cws2fws
-/tools/graph2dot
-/tools/ismindex
-/tools/pktdumper
-/tools/probetest
-/tools/qt-faststart
-/tools/sidxindex
-/tools/trasher
+/src
+/mapfile