[FFmpeg-cvslog] Merge commit 'a08b5d7b5725932f4ad39e95c5d6589392dee2c6'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Thu May 12 14:28:17 2016 +0100| [d4acf9f2dd2aba8fa84ad58df0abf5c9353b4f6a] | committer: Derek Buitenhuis

Merge commit 'a08b5d7b5725932f4ad39e95c5d6589392dee2c6'

* commit 'a08b5d7b5725932f4ad39e95c5d6589392dee2c6':
  build: Silence the lcov-reset target

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d4acf9f2dd2aba8fa84ad58df0abf5c9353b4f6a
---

 tests/Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Makefile b/tests/Makefile
index c3e5ea9..e72b8df 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -229,7 +229,7 @@ lcov: coverage.info
 
 lcov-reset: TAG = LCOV
 lcov-reset:
-	$(M)lcov -d $(CURDIR) --zerocounters
+	$(M)lcov -q -d $(CURDIR) --zerocounters
 	$(Q)$(RM) -f coverage.info
 
 clean:: testclean


======================================================================