ffmpeg-streaming - Raptor Engineering's fork of FFmpeg with streaming enhancements https://git.ffmpeg.org/ffmpeg.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge commit '56d061ce9da954560892e3551513d5ecc0439846'	Michael Niedermayer	2013-11-26	1	-0/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '56d061ce9da954560892e3551513d5ecc0439846': metasound: add last missing modes (8kHz @ 6kbps per channel) Conflicts: Changelog doc/general.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
\| *	metasound: add last missing modes (8kHz @ 6kbps per channel)	Kostya Shishkov	2013-11-26	1	-0/+2
\| \| \| \| \| \| \| \|	Signed-off-by: Anton Khirnov <anton@khirnov.net>
* \|	Merge commit '1afa8a7568ba57ad0cd2923f6e641e10d32cded4'	Michael Niedermayer	2013-11-14	1	-1/+4
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '1afa8a7568ba57ad0cd2923f6e641e10d32cded4': twinvq: support multiple frames per packet Conflicts: libavcodec/twinvq.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
\| *	twinvq: support multiple frames per packet	Kostya Shishkov	2013-11-14	1	-1/+4
\| \| \| \| \| \| \| \|	Signed-off-by: Diego Biurrun <diego@biurrun.de>
* \|	Merge commit '86f4c59bd676672040b89d8fea4c9e3b59bfe7ab'	Michael Niedermayer	2013-08-06	1	-4/+4
\|/ \| \| \| \| \| \| \| \| \| \|	* 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>
*	twinvq: Split VQF-specific part from common TwinVQ decoder core	Kostya Shishkov	2013-08-05	1	-0/+198
	Signed-off-by: Diego Biurrun <diego@biurrun.de>