Merge commit '03f2de5856ec8571fcf5f4cf6dccc713294af545'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Jan 2014 13:31:13 +0000 (14:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Jan 2014 13:31:19 +0000 (14:31 +0100)
* commit '03f2de5856ec8571fcf5f4cf6dccc713294af545':
  aviocat: Check the argv array length before reading element i+1

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
tools/aviocat.c

diff --cc tools/aviocat.c
Simple merge