[FFmpeg-cvslog] Merge commit 'bdcb5794f0c2d74371152303bffe4172671af264'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 13 12:13:38 2014 +0100| [946a5cb64d580098e6abc399fd404e81fc816742] | committer: Michael Niedermayer

Merge commit 'bdcb5794f0c2d74371152303bffe4172671af264'

* commit 'bdcb5794f0c2d74371152303bffe4172671af264':
  nellymoserenc: fix array index

Not merged, the original code was correct.

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

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