diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-12 01:57:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-12 01:57:02 +0200 |
| commit | 5449239a031e657cfe364521d2b6d58c0ef0e7f0 (patch) | |
| tree | c7293a1078cf2840bbe3515e6ab2d56f7f64ee9b /libavcodec/allcodecs.c | |
| parent | c6a683bf2291344238cb1fc2bd84c91fa1acd3bc (diff) | |
| parent | 67afcefb35932b420998f6f3fda46c7c85848a3f (diff) | |
| download | ffmpeg-5449239a031e657cfe364521d2b6d58c0ef0e7f0.tar.gz | |
Merge commit '67afcefb35932b420998f6f3fda46c7c85848a3f'
* commit '67afcefb35932b420998f6f3fda46c7c85848a3f':
lavc: Add new VDA hwaccel
Conflicts:
configure
libavcodec/vda.h
libavcodec/vda_h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/allcodecs.c')
| -rw-r--r-- | libavcodec/allcodecs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index a1cd44e983..e8c6ab7f39 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -79,6 +79,7 @@ void avcodec_register_all(void) REGISTER_HWACCEL(H264_DXVA2, h264_dxva2); REGISTER_HWACCEL(H264_VAAPI, h264_vaapi); REGISTER_HWACCEL(H264_VDA, h264_vda); + REGISTER_HWACCEL(H264_VDA_OLD, h264_vda_old); REGISTER_HWACCEL(H264_VDPAU, h264_vdpau); REGISTER_HWACCEL(MPEG1_XVMC, mpeg1_xvmc); REGISTER_HWACCEL(MPEG1_VDPAU, mpeg1_vdpau); |