summaryrefslogtreecommitdiff
path: root/libavcodec/qsvenc.h
Commit message (Collapse)AuthorAge
* Merge commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2'Michael Niedermayer2015-03-28
| | | | | | | | | | | * commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2': lavc: add Intel libmfx-based H.264 encoder Conflicts: Changelog libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* lavc: add Intel libmfx-based H.264 encoderAnton Khirnov2015-03-27