summaryrefslogtreecommitdiff
path: root/libavcodec/qsv_api.c
Commit message (Collapse)AuthorAge
* Merge commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23'Michael Niedermayer2015-02-19
|\ | | | | | | | | | | | | * commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23': qsv_api: fix building with libmfx disabled Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * qsv_api: fix building with libmfx disabledAnton Khirnov2015-02-19
| |
* | Merge commit '4e08c821106fc1d6d358864abf0d8488b12f38c6'Michael Niedermayer2015-02-19
|/ | | | | | | | | | | | | * 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 decoderAnton Khirnov2015-02-19
Based on the code by Luca Barbato <lu_zero@gentoo.org> and Yukinori Yamazoe <drocon11@gmail.com>.