Merge commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196'
[ffmpeg.git] / .gitignore
index 5464bba..2b251c9 100644 (file)
@@ -1,5 +1,6 @@
 *.a
 *.o
+*.o.*
 *.d
 *.def
 *.dll
 *.so.*
 *.swp
 *.ver
+*_g
+\#*
+.\#*
 /.config
 /.version
-/avconv
-/avplay
-/avprobe
-/avversion.h
+/ffmpeg
+/ffplay
+/ffprobe
+/ffserver
 /config.*
 /coverage.info
+/avversion.h
 /lcov/
+/src