[FFmpeg-cvslog] Merge commit '2fa6d21124bd2fc0b186290f5313179263bfcfb7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov 15 19:22:30 2014 +0100| [dcb10ef9bff32fe0496f261833a12297a7022775] | committer: Michael Niedermayer

Merge commit '2fa6d21124bd2fc0b186290f5313179263bfcfb7'

* commit '2fa6d21124bd2fc0b186290f5313179263bfcfb7':
  on2avc: Fix out of array access

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

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