[FFmpeg-cvslog] Merge commit 'ddb839e9286594ff7a862a956402106fca7055c9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 14 15:31:00 2013 +0100| [2cfdc2879a6cc2f956a8a1878a4a6490c58ad5c7] | committer: Michael Niedermayer

Merge commit 'ddb839e9286594ff7a862a956402106fca7055c9'

* commit 'ddb839e9286594ff7a862a956402106fca7055c9':
  metasound: add missing modes

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

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