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)
commitac4447b6ec4e2dd1dc9d0432241cf5a63c3b54e6
tree532887296f376eaab7a806663e4a11de9496db6f
parenta26e83da6c96d21b18668f0a00e6627172f43722
parent5462dde1947e0ecfcb2db99ae29ce9dee8933b45
Merge commit '5462dde1947e0ecfcb2db99ae29ce9dee8933b45'

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

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