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

	Commit message (Collapse)	Author	Age	Files	Lines
*	wtv: make ff_format_videoinfo2 visible to wtv encoder	Peter Ross	2013-12-23	1	-0/+2
\| \| \| \| \|	Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
*	Merge remote-tracking branch 'qatar/master'	Michael Niedermayer	2013-10-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|	* qatar/master: wtv: Seek by sector properly Conflicts: libavformat/wtvdec.c See: a0d13d84a928110b0e99ea16d17fd758fcbde35f Merged-by: Michael Niedermayer <michaelni@gmx.at>
*	Merge commit '86f042dcabde2a5386dbd95ab0451b274987d253'	Michael Niedermayer	2013-07-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	* commit '86f042dcabde2a5386dbd95ab0451b274987d253': wtv: Make WTV_SECTOR_BITS a 64 bit constant Conflicts: libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
*	wtv: move duplicated guids into wtv.c	Peter Ross	2012-11-06	1	-0/+3
\| \| \| \|	Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
*	wtv: rename ff_stream_guid to ff_SBE2_STREAM_DESC_EVENT	Peter Ross	2012-11-06	1	-1/+1
\| \| \| \|	Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
*	WTV muxer (1_extract_wtv_common_code.patch)	zhentan feng	2011-09-08	1	-0/+14
\|
*	WTV: Add ff_ prefix to the moved fields.	zhentan feng	2011-05-01	1	-9/+9
\| \| \| \|	Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
*	WTV:move the common variable used by wtvdec.c and wtvenc.c to a new file ↵	zhentan feng	2011-05-01	1	-0/+41
	wtv.h and wtv.c. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>