2 commits

Author	SHA1	Message	Date
Michael Niedermayer	7d03e60c12	Merge commit '86f4c59bd6' ... * commit '86f4c59bd6': 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