ffmpeg - Mirror of FFmpeg git repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge commit '3a70c0c95feacb3844d05eebd579fc8189a77eee'	Michael Niedermayer	2015-01-27	1	-0/+13
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	* commit '3a70c0c95feacb3844d05eebd579fc8189a77eee': examples/transcode_aac: generate proper PTS and set the muxer timebase Merged-by: Michael Niedermayer <[email protected]>
\| *	examples/transcode_aac: generate proper PTS and set the muxer timebase	Andreas Unterweger	2015-01-27	1	-0/+13
\| \| \| \| \| \| \| \|	Signed-off-by: Anton Khirnov <[email protected]>
* \|	Merge commit 'c9b19ac8928c6c9b7f25c3988177204f110d5e0e'	Michael Niedermayer	2015-01-27	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'c9b19ac8928c6c9b7f25c3988177204f110d5e0e': examples/transcode_aac: fix a typo Merged-by: Michael Niedermayer <[email protected]>
\| *	examples/transcode_aac: fix a typo	Andreas Unterweger	2015-01-27	1	-1/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Anton Khirnov <[email protected]>
* \|	Merge commit '749a89d1b8bb73b4d4f14c48f33259a1300c1761'	Michael Niedermayer	2015-01-27	1	-7/+9
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '749a89d1b8bb73b4d4f14c48f33259a1300c1761': examples/transcode_aac: properly select the output sample format Merged-by: Michael Niedermayer <[email protected]>
\| *	examples/transcode_aac: properly select the output sample format	Andreas Unterweger	2015-01-27	1	-7/+9
\| \| \| \| \| \| \| \| \| \| \| \|	Makes the example work with all the supported AAC encoders. Signed-off-by: Anton Khirnov <[email protected]>
* \|	doc/examples/transcode_aac: Use avio_closep() in examples as it avoids ↵	Michael Niedermayer	2015-01-08	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	leaving stale pointers Signed-off-by: Michael Niedermayer <[email protected]>
* \|	doc: fix the the typos	Michael Niedermayer	2014-11-22	1	-1/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Michael Niedermayer <[email protected]>
* \|	transcode_aac: fix const return value	Timothy Gu	2014-08-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes Trac #3613. Signed-off-by: Timothy Gu <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* \|	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 <[email protected]>
\| *	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 <[email protected]>
\| *	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 <[email protected]>
* \|	doc/examples/transcode_aac: switch to swresample	Michael Niedermayer	2013-11-27	1	-44/+34
\| \| \| \| \| \| \| \|	Signed-off-by: Michael Niedermayer <[email protected]>
* \|	doc/examples/transcode_aac: fix project name	Michael Niedermayer	2013-11-27	1	-1/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Michael Niedermayer <[email protected]>
* \|	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 <[email protected]>
*	Add an audio transcoding example.	Andreas Unterweger	2013-11-27	1	-0/+769
	Signed-off-by: Anton Khirnov <[email protected]>