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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge commit 'd4f1188d1a662fed5347e70016da49e01563e8a8'	Michael Niedermayer	2013-12-09	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'd4f1188d1a662fed5347e70016da49e01563e8a8': dv: use AVFrame API properly Conflicts: libavcodec/dvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
\| *	dv: use AVFrame API properly	Anton Khirnov	2013-12-09	1	-1/+1
\| \|
* \|	Merge commit '3cbe1126530449336e2ce59b194bdb8c4eb4abb4'	Michael Niedermayer	2013-11-15	1	-7/+4
\|/ \| \| \| \| \| \| \| \| \|	* commit '3cbe1126530449336e2ce59b194bdb8c4eb4abb4': dv: Split DV data table declarations into their own header Conflicts: libavcodec/dvdata.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
*	dv: Split DV data table declarations into their own header	Diego Biurrun	2013-11-15	1	-0/+118
	This is necessary to avoid target config settings bleeding into the host compilation process with hardcoded tables and the DV VLC tables no longer present as static tables in a header file.