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)
commit9f3a555b84ba5ddc948e0700719ea2f9796acbd5
treeaf77de4125cb3c4b52b2c4ab8032ddda5296f3b3
parentd2a7314f1e0d8404eb82316ad7f12665c24d48e7
parent03f2de5856ec8571fcf5f4cf6dccc713294af545
Merge commit '03f2de5856ec8571fcf5f4cf6dccc713294af545'

* commit '03f2de5856ec8571fcf5f4cf6dccc713294af545':
  aviocat: Check the argv array length before reading element i+1

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