summaryrefslogtreecommitdiff
path: root/libavcodec/qsv_api.c
Commit message (Expand)AuthorAge
* Merge commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23'Michael Niedermayer2015-02-19
|\
| * qsv_api: fix building with libmfx disabledAnton Khirnov2015-02-19
* | Merge commit '4e08c821106fc1d6d358864abf0d8488b12f38c6'Michael Niedermayer2015-02-19
|/
* lavc: add an Intel libmfx-based H.264 decoderAnton Khirnov2015-02-19