delta/ffmpeg.git - git.ffmpeg.org: ffmpeg.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge commit 'a16577d9857206089fd8bce6a342b31dbd7fb9b0'	Michael Niedermayer	2013-11-26	1	-2/+16
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'a16577d9857206089fd8bce6a342b31dbd7fb9b0': MSN Audio support Conflicts: libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
\| *	MSN Audio support	Kostya Shishkov	2013-11-26	1	-2/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is essentially a MS GSM decoder extension that supports more sampling rates and lower bitrates. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* \|	gsm.h: Fix project reference	Michael Niedermayer	2012-02-01	1	-4/+4
\|/ \| \| \| \| \|	The code in this file is copy and pasted from FFmpegs libavcodec/libgsm.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
*	avcodec: add GSM parser	Justin Ruggles	2012-01-11	1	-0/+31
	The WAVE demuxer returns packets with many blocks per frame, which needs to be parsed into single blocks. This has a side-effect of fixing the timestamps.