Merge commit 'c21d78a903da378af48c9e5f971fe989592ddb65'
[ffmpeg.git] / .gitignore
index e71246c..524fb73 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
 /mapfile