Merge commit '5462dde1947e0ecfcb2db99ae29ce9dee8933b45'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Nov 2013 22:36:59 +0000 (23:36 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Nov 2013 22:37:14 +0000 (23:37 +0100)
* commit '5462dde1947e0ecfcb2db99ae29ce9dee8933b45':
  metasound: Fix error message argument

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/metasound.c

Simple merge