ffmpeg - Mirror of FFmpeg git repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'newdev/master'	Michael Niedermayer	2011-03-28	1	-0/+336
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* newdev/master: ac3enc: Add codec-specific options for writing AC-3 metadata. NOT MERGED: Remove arrozcru URL from documentation sndio support for playback and record Conflicts: doc/faq.texi doc/general.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
\| *	ac3enc: Add codec-specific options for writing AC-3 metadata.	Justin Ruggles	2011-03-27	1	-0/+336
\| \|
* \|	Revert "replace FFmpeg with Libav in doc/"	Michael Niedermayer	2011-03-17	1	-2/+2
\|/ \| \| \| \| \| \| \|	This reverts commit f8a45fa1b1764b34d4263eacd93411e8ba0484a4. Conflicts: doc/optimization.txt
*	replace FFmpeg with Libav in doc/	Janne Grunau	2011-03-16	1	-2/+2
\| \| \| \|	unless it stands for ffmpeg the program or is historic
*	documentation: add encoders chapter	James Zern	2011-02-17	1	-0/+20
	Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>