6 Commits

Author	SHA1	Message	Date
Michael Niedermayer	ac021fdc40	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>	2013-11-26 12:28:31 +01:00
Kostya Shishkov	56d061ce9d	metasound: add last missing modes (8kHz @ 6kbps per channel) ... Signed-off-by: Anton Khirnov <anton@khirnov.net>	2013-11-26 08:29:42 +01:00
Michael Niedermayer	a24aef5dfa	Merge commit '1afa8a7568ba57ad0cd2923f6e641e10d32cded4' ... * commit '1afa8a7568ba57ad0cd2923f6e641e10d32cded4': twinvq: support multiple frames per packet Conflicts: libavcodec/twinvq.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2013-11-14 15:42:05 +01:00
Kostya Shishkov	1afa8a7568	twinvq: support multiple frames per packet ... Signed-off-by: Diego Biurrun <diego@biurrun.de>	2013-11-14 13:38:10 +01:00
Michael Niedermayer	7d03e60c12	Merge commit '86f4c59bd676672040b89d8fea4c9e3b59bfe7ab' ... * commit '86f4c59bd676672040b89d8fea4c9e3b59bfe7ab': twinvq: Split VQF-specific part from common TwinVQ decoder core Conflicts: libavcodec/Makefile libavcodec/twinvq.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2013-08-06 16:37:08 +02:00
Kostya Shishkov	86f4c59bd6	twinvq: Split VQF-specific part from common TwinVQ decoder core ... Signed-off-by: Diego Biurrun <diego@biurrun.de>	2013-08-05 20:59:23 +02:00