diff options
| author | Hagen Schmidt <schmidthagen@googlemail.com> | 2015-11-22 00:54:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-23 00:34:14 +0100 |
| commit | 59494863ff34228a2951a54e83b4321b51535a73 (patch) | |
| tree | 68b88fdaf33e5d2434069d1adc360e96c2bb6850 /tools | |
| parent | 90ccfdb65bc0a912bf365d7fa2961dcb591c1b89 (diff) | |
| download | ffmpeg-59494863ff34228a2951a54e83b4321b51535a73.tar.gz | |
patcheck: Fix false detection of 'mergeable calls' when line is removed
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/patcheck | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/patcheck b/tools/patcheck index cbdbf8d34a..06482e260b 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" |