Merge commit 'e39a9212ab37a55b346801c77487d8a47b6f9fe2'
[ffmpeg.git] / .gitignore
index e71246c..0e57cb0 100644 (file)
@@ -1,5 +1,6 @@
 *.a
 *.o
+*.o.*
 *.d
 *.def
 *.dll
 *.so.*
 *.swp
 *.ver
+*.version
+*.ptx
+*.ptx.c
+*_g
+\#*
+.\#*
 /.config
 /.version
-/avconv
-/avplay
-/avprobe
-/avversion.h
-/config.*
+/ffmpeg
+/ffplay
+/ffprobe
+/config.asm
+/config.h
 /coverage.info
+/avversion.h
 /lcov/
+/src
 /mapfile