[FFmpeg-cvslog] Merge commit 'aa7c429c4e8e561009176d51b7dcb626c85eb276'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 13 12:12:40 2014 +0100| [0f29e92091d4e1cff69a83e863bf548e5e26adf6] | committer: Michael Niedermayer

Merge commit 'aa7c429c4e8e561009176d51b7dcb626c85eb276'

* commit 'aa7c429c4e8e561009176d51b7dcb626c85eb276':
  nellymoserenc: fix array element ordering

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

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