[FFmpeg-cvslog] Merge commit '97f50e92b5cf3b47a76f75d76ed4340e822030db'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov  4 21:59:21 2013 +0100| [b1f213a83ae8d4fe3fa83a145fdbe6da7fd36a90] | committer: Michael Niedermayer

Merge commit '97f50e92b5cf3b47a76f75d76ed4340e822030db'

* commit '97f50e92b5cf3b47a76f75d76ed4340e822030db':
  omadec: Fix wrong number of array elements

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

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