6 Commits

Author	SHA1	Message	Date
Michael Niedermayer	0a731e4596	Merge commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2' ... * commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2': lavc: add Intel libmfx-based H.264 encoder Conflicts: Changelog libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2015-03-28 01:33:27 +01:00
Michael Niedermayer	b12eacb383	Merge commit 'd0a63d8b989647ffdb5f40da8e1feaffe1a8e791' ... * commit 'd0a63d8b989647ffdb5f40da8e1feaffe1a8e791': qsvdec: split off some code that will be shared with the encoder Conflicts: libavcodec/Makefile libavcodec/qsvdec.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2015-03-28 01:16:21 +01:00
Anton Khirnov	72b7441a10	lavc: add Intel libmfx-based H.264 encoder	2015-03-27 22:02:10 +01:00
Anton Khirnov	d0a63d8b98	qsvdec: split off some code that will be shared with the encoder	2015-03-27 21:57:28 +01:00
Anton Khirnov	b04d009b0e	qsv: rename to qsvdec ... This is to avoid conflicts with the upcoming QSV encoding support.	2015-03-27 21:56:36 +01:00
Anton Khirnov	4e08c82110	lavc: add an Intel libmfx-based H.264 decoder ... Based on the code by Luca Barbato <lu_zero@gentoo.org> and Yukinori Yamazoe <drocon11@gmail.com>.	2015-02-19 15:08:49 +01:00