summaryrefslogtreecommitdiff
path: root/libavcodec/hevc_ps_enc.c
Commit message (Collapse)AuthorAge
* Merge commit '66acb76bb0492b263215ca9b4d927a7be39ace02'Michael Niedermayer2015-07-09
| | | | | | | | | | | | | | | | * commit '66acb76bb0492b263215ca9b4d927a7be39ace02': lavc: add Intel libmfx-based HEVC encoder Conflicts: Changelog configure libavcodec/Makefile libavcodec/allcodecs.c libavcodec/qsv.c libavcodec/qsvenc.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* lavc: add Intel libmfx-based HEVC encoderAnton Khirnov2015-07-08