diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-26 01:20:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-26 01:20:46 +0200 |
| commit | 508b79e6c1dc40d9d96d027ed38dab3a9b9a7287 (patch) | |
| tree | bac3551d01c1d7304475ab01effbfc4bd34576a6 /libavcodec/allcodecs.c | |
| parent | bb619f41bea81e6ee9e208476a92fced4107a853 (diff) | |
| parent | 41d47ea85fb4ad9cfb5c2dc808a46bc1d57f3986 (diff) | |
| download | ffmpeg-508b79e6c1dc40d9d96d027ed38dab3a9b9a7287.tar.gz | |
Merge commit '41d47ea85fb4ad9cfb5c2dc808a46bc1d57f3986'
* commit '41d47ea85fb4ad9cfb5c2dc808a46bc1d57f3986':
lavc: add Intel libmfx-based HEVC decoder.
Conflicts:
Changelog
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/qsvdec.c
libavcodec/qsvdec_h2645.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/allcodecs.c')
| -rw-r--r-- | libavcodec/allcodecs.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index d4831e400c..417f824041 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -86,6 +86,7 @@ void avcodec_register_all(void) REGISTER_HWACCEL(H264_VDPAU, h264_vdpau); REGISTER_HWACCEL(HEVC_D3D11VA, hevc_d3d11va); REGISTER_HWACCEL(HEVC_DXVA2, hevc_dxva2); + REGISTER_HWACCEL(HEVC_QSV, hevc_qsv); REGISTER_HWACCEL(HEVC_VDPAU, hevc_vdpau); REGISTER_HWACCEL(MPEG1_XVMC, mpeg1_xvmc); REGISTER_HWACCEL(MPEG1_VDPAU, mpeg1_vdpau); @@ -187,6 +188,7 @@ void avcodec_register_all(void) REGISTER_DECODER(H264_VDPAU, h264_vdpau); REGISTER_ENCDEC (HAP, hap); REGISTER_DECODER(HEVC, hevc); + REGISTER_DECODER(HEVC_QSV, hevc_qsv); REGISTER_DECODER(HNM4_VIDEO, hnm4_video); REGISTER_DECODER(HQ_HQA, hq_hqa); REGISTER_DECODER(HQX, hqx); |