[FFmpeg-cvslog] Merge commit '03f2de5856ec8571fcf5f4cf6dccc713294af545'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jan 17 14:31:13 2014 +0100| [9f3a555b84ba5ddc948e0700719ea2f9796acbd5] | committer: Michael Niedermayer

Merge commit '03f2de5856ec8571fcf5f4cf6dccc713294af545'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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