summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-04-06 13:23:38 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-04-06 13:23:38 +0200
commit84bfa8beb708d7594d298b438d3fa9c21630da97 (patch)
tree173f86e3bdc612efbbd168245159e14c6d66ed65 /.gitignore
parent11d7bbb47a1e8109aef90f62eb63ce0039f23340 (diff)
parenta862c7d3368241e72a465ab944afa38ea62a6640 (diff)
downloadffmpeg-streaming-84bfa8beb708d7594d298b438d3fa9c21630da97.zip
ffmpeg-streaming-84bfa8beb708d7594d298b438d3fa9c21630da97.tar.gz
Merge commit 'a862c7d3368241e72a465ab944afa38ea62a6640'
* commit 'a862c7d3368241e72a465ab944afa38ea62a6640': Integrate lcov/gcov into Libav Conflicts: Makefile common.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index f98c20c..979d617 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,8 @@
*.dylib
*.exe
*.exp
+*.gcda
+*.gcno
*.h.c
*.ilk
*.lib
@@ -24,6 +26,7 @@
/ffprobe
/ffserver
/config.*
+/coverage.info
/version.h
/doc/*.1
/doc/*.3
@@ -44,6 +47,7 @@
/doc/fate.txt
/doc/doxy/html/
/doc/print_options
+/lcov/
/libavcodec/*_tablegen
/libavcodec/*_tables.c
/libavcodec/*_tables.h
OpenPOWER on IntegriCloud