[FFmpeg-cvslog] Merge commit '5462dde1947e0ecfcb2db99ae29ce9dee8933b45'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov  8 23:36:59 2013 +0100| [ac4447b6ec4e2dd1dc9d0432241cf5a63c3b54e6] | committer: Michael Niedermayer

Merge commit '5462dde1947e0ecfcb2db99ae29ce9dee8933b45'

* commit '5462dde1947e0ecfcb2db99ae29ce9dee8933b45':
  metasound: Fix error message argument

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

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