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

	Commit message (Collapse)	Author	Age	Files	Lines
*	avformat/framecrc: enable new output	James Almer	2016-04-13	1	-0/+4
\| \| \| \| \|	Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
*	Merge commit 'dff6197dfb9b2d145729885c63f865c5fdd184aa'	Michael Niedermayer	2013-02-06	1	-7/+7
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'dff6197dfb9b2d145729885c63f865c5fdd184aa': nuv: do not rely on get_buffer() initializing the frame. yop: initialize palette to 0 Conflicts: libavcodec/nuv.c tests/ref/fate/nuv-rtjpeg-fh tests/ref/fate/yop Merged-by: Michael Niedermayer <michaelni@gmx.at>
\| *	nuv: do not rely on get_buffer() initializing the frame.	Anton Khirnov	2013-02-06	1	-7/+7
\| \|
* \|	lavf: Provide a monotonic timestamp to the outside world	Harald Axmann	2012-12-15	1	-50/+50
\| \| \| \| \| \| \| \|	Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* \|	Merge remote-tracking branch 'qatar/master'	Michael Niedermayer	2012-08-09	1	-51/+51
\|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* qatar/master: (23 commits) build: cosmetics: Reorder some lists in a more logical fashion x86: pngdsp: Fix assembly for OS/2 fate: add test for RTjpeg in nuv with frameheader rtmp: send check_bw as notification g723_1: clip argument for 15-bit version of normalize_bits() g723_1: use all LPC vectors in formant postfilter id3v2: Support v2.2 PIC avplay: fix build with lavfi disabled. avconv: split configuring filter configuration to a separate file. avconv: split option parsing into a separate file. mpc8: do not leave padding after last frame in buffer for the next decode call mpegaudioenc: list supported channel layouts. mpegaudiodec: don't print an error on > 1 frame in a packet. api-example: update to new audio encoding API. configure: add --enable/disable-random option doc: cygwin: Update list of FATE package requirements build: Remove all installed headers and header directories on uninstall build: change checkheaders to use regular build rules rtmp: Add a new option 'rtmp_subscribe' rtmp: Add support for subscribing live streams ... Conflicts: Makefile common.mak configure doc/examples/decoding_encoding.c ffmpeg.c libavcodec/g723_1.c libavcodec/mpegaudiodec.c libavcodec/x86/pngdsp.asm libavformat/version.h library.mak tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
*	fate: add test for RTjpeg in nuv with frameheader	Janne Grunau	2012-08-08	1	-0/+51
	Renames the old test to allow using fate-nuv as group for all nuv tests.