Michael Niedermayer
|
99bcfe6227
|
Merge commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23'
* commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23':
qsv_api: fix building with libmfx disabled
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2015-02-19 21:12:33 +01:00 |
|
Michael Niedermayer
|
841e9f431c
|
Merge commit '4e08c821106fc1d6d358864abf0d8488b12f38c6'
* 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>
|
2015-02-19 21:12:04 +01:00 |
|
Anton Khirnov
|
0fbb271318
|
qsv_api: fix building with libmfx disabled
|
2015-02-19 17:35:34 +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 |
|