Merge commit '4d8d16b596c63de85e52488734338fbb41238058'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 14:29:28 +0000 (16:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 14:29:35 +0000 (16:29 +0200)
commita97f7499909a589249844c46e54ff25bc2ae7720
tree7e49f3330893b69068c3aa4ee3c6f40e4a02800f
parent9648c8e57b153f5783007a23fb9c360d0cb64a93
parent4d8d16b596c63de85e52488734338fbb41238058
Merge commit '4d8d16b596c63de85e52488734338fbb41238058'

* commit '4d8d16b596c63de85e52488734338fbb41238058':
  twinvq: Prefix enums and defines shared with VoxWare MetaSound

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