Merge commit 'ddb839e9286594ff7a862a956402106fca7055c9'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Nov 2013 14:31:00 +0000 (15:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Nov 2013 14:31:34 +0000 (15:31 +0100)
commit2cfdc2879a6cc2f956a8a1878a4a6490c58ad5c7
tree5e6c198f1ad91f66c929728af2178300c1356908
parent1ac4797d1998a894eccc5fe68396c7df1abd2093
parentddb839e9286594ff7a862a956402106fca7055c9
Merge commit 'ddb839e9286594ff7a862a956402106fca7055c9'

* commit 'ddb839e9286594ff7a862a956402106fca7055c9':
  metasound: add missing modes

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