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)
* commit '4d8d16b596c63de85e52488734338fbb41238058':
  twinvq: Prefix enums and defines shared with VoxWare MetaSound

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

Simple merge