[FFmpeg-cvslog] Merge commit '4d8d16b596c63de85e52488734338fbb41238058'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug  6 16:29:28 2013 +0200| [a97f7499909a589249844c46e54ff25bc2ae7720] | committer: Michael Niedermayer

Merge commit '4d8d16b596c63de85e52488734338fbb41238058'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a97f7499909a589249844c46e54ff25bc2ae7720
---