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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'qatar/master'	Michael Niedermayer	2012-11-09	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* qatar/master: flacenc: ensure the order is within the min/max range in LPC order search avconv: rescale packet duration to muxer time base when flushing encoders add 24-bit FLAC encoding to Changelog rtpenc_aac: Fix calculation of the header size x86: h264_intrapred: port to cpuflags Conflicts: Changelog libavformat/rtpenc_aac.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
\| *	rtpenc_aac: Fix calculation of the header size	Luca Abeni	2012-11-08	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously the high end byte was always set to zero. Also get rid of an unnecessary multiplication (which in practice couldn't overflow) before shifting. Signed-off-by: Martin Storsjö <martin@martin.st>
\| *	Replace FFmpeg with Libav in licence headers	Mans Rullgard	2011-03-19	1	-4/+4
\| \| \| \| \| \| \| \|	Signed-off-by: Mans Rullgard <mans@mansr.com>
* \|	rtpenc_aac: Fix 10l bug	Luca Abeni	2012-11-08	1	-2/+2
\|/ \| \| \| \|	Fixes CID602564 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
*	Rename the RTP muxer sources so that the packetisation functions are in	Luca Abeni	2010-01-18	1	-0/+85
	rtpenc_*.c files. Originally committed as revision 21284 to svn://svn.ffmpeg.org/ffmpeg/trunk