ffmpeg - Mirror of FFmpeg git repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	transcode_aac: fix const return value	Timothy Gu	2014-08-06	1	-1/+1
\| \| \| \| \| \| \|	Fixes Trac #3613. Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
*	Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'	Michael Niedermayer	2014-02-17	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90': Move all example programs to doc/examples Conflicts: configure doc/Makefile doc/doxy-wrapper.sh doc/examples/avcodec.c doc/examples/decoding_encoding.c doc/examples/metadata.c doc/examples/muxing.c doc/examples/transcode_aac.c libavcodec/Makefile libavcodec/api-example.c libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
\| *	Move all example programs to doc/examples	Diego Biurrun	2014-02-16	1	-1/+1
\| \| \| \| \| \| \| \|	Also drop support for building examples in library directories.
* \|	Merge remote-tracking branch 'qatar/master'	Michael Niedermayer	2014-02-14	1	-1/+4
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* qatar/master: doc/examples: misc Doxygen markup improvements Conflicts: doc/examples/muxing.c doc/examples/transcode_aac.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
\| *	doc/examples: misc Doxygen markup improvements	Diego Biurrun	2014-02-14	1	-1/+4
\| \| \| \| \| \| \| \|	Add properly formatted @example tag and fix Doxygen syntax.
* \|	doc/examples/transcode_aac: remove non converted codepath	Michael Niedermayer	2013-11-27	1	-7/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	This codepath is not implemented and just crashes, also its simpler without special cases, which makes sense for an example Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* \|	doc/examples/transcode_aac: switch to swresample	Michael Niedermayer	2013-11-27	1	-44/+34
\| \| \| \| \| \| \| \|	Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* \|	doc/examples/transcode_aac: fix project name	Michael Niedermayer	2013-11-27	1	-1/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* \|	Merge remote-tracking branch 'qatar/master'	Michael Niedermayer	2013-11-27	1	-4/+4
\|/ \| \| \| \| \| \| \| \| \| \|	* qatar/master: Add an audio transcoding example. Conflicts: configure doc/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
*	Add an audio transcoding example.	Andreas Unterweger	2013-11-27	1	-0/+769
	Signed-off-by: Anton Khirnov <anton@khirnov.net>