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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23'	Michael Niedermayer	2015-02-19	1	-0/+14
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	* commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23': qsv_api: fix building with libmfx disabled Merged-by: Michael Niedermayer <michaelni@gmx.at>
\| *	qsv_api: fix building with libmfx disabled	Anton Khirnov	2015-02-19	1	-0/+14
\| \|
* \|	Merge commit '4e08c821106fc1d6d358864abf0d8488b12f38c6'	Michael Niedermayer	2015-02-19	1	-4/+4
\|/ \| \| \| \| \| \| \| \| \| \| \| \|	* commit '4e08c821106fc1d6d358864abf0d8488b12f38c6': lavc: add an Intel libmfx-based H.264 decoder Conflicts: configure libavcodec/Makefile libavcodec/allcodecs.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
*	lavc: add an Intel libmfx-based H.264 decoder	Anton Khirnov	2015-02-19	1	-0/+28
	Based on the code by Luca Barbato <lu_zero@gentoo.org> and Yukinori Yamazoe <drocon11@gmail.com>.