[FFmpeg-cvslog] patcheck: Fix false detection of 'mergeable calls' when line is removed

[Hagen Schmidt]

ffmpeg | branch: master | Hagen Schmidt <schmidthagen at googlemail.com> | Sun Nov 22 00:54:56 2015 +0100| [59494863ff34228a2951a54e83b4321b51535a73] | committer: Michael Niedermayer

patcheck: Fix false detection of 'mergeable calls' when line is removed

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 tools/patcheck |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/patcheck b/tools/patcheck
index cbdbf8d..06482e2 100755
--- a/tools/patcheck
+++ b/tools/patcheck
@@ -143,7 +143,7 @@ fi
 
 $GREP '^+++ .*Changelog' $* >/dev/null || printf "\nMissing changelog entry (ignore if minor change)\n"
 
-cat $* | tr '\n' '@' | $EGREP --color=always -o '(fprintf|av_log|printf)\([^)]*\)[+ ;@]*\1'  >$TMP && printf "\nMergeable calls\n"
+cat $* | $GREP -v '^-' | tr '\n' '@' | $EGREP --color=always -o '(fprintf|av_log|printf)\([^)]*\)[+ ;@]*\1'  >$TMP && printf "\nMergeable calls\n"
 cat $TMP | tr '@' '\n'
 
 cat $* | tr '\n' '@' | $EGREP --color=always -o '\+ *if *\( *([A-Za-z0-9_]*) *[<>]=? *[0-9]* *\) * \1 *= *[0-9]* *;[ @\\+]*else *if *\( *\1 *[<>]=? *[0-9]* *\) *\1 *= *[0-9]* *;'  >$TMP && printf "\nav_clip / av_clip_uint8 / av_clip_int16 / ...\n"