Merge commit '56d061ce9da954560892e3551513d5ecc0439846'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 26 Nov 2013 11:28:31 +0000 (12:28 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 26 Nov 2013 11:28:31 +0000 (12:28 +0100)
commitac021fdc40631f77a727f076f8748f89109c785b
treea51ba691da5f29c81d3ea61848b2938236f88ec2
parent0290a646ac662a8552dfdb2de4887cac7a79acd1
parent56d061ce9da954560892e3551513d5ecc0439846
Merge commit '56d061ce9da954560892e3551513d5ecc0439846'

* commit '56d061ce9da954560892e3551513d5ecc0439846':
  metasound: add last missing modes (8kHz @ 6kbps per channel)

Conflicts:
Changelog
doc/general.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
doc/general.texi
libavcodec/metasound.c
libavcodec/metasound_data.c
libavcodec/twinvq.c
libavcodec/twinvq.h
libavcodec/twinvqdec.c