diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-12 03:57:02 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-12 03:57:02 +0400 |
| commit | 5449239a031e657cfe364521d2b6d58c0ef0e7f0 (patch) | |
| tree | c7293a1078cf2840bbe3515e6ab2d56f7f64ee9b /configure | |
| parent | c6a683bf2291344238cb1fc2bd84c91fa1acd3bc (diff) | |
| parent | 67afcefb35932b420998f6f3fda46c7c85848a3f (diff) | |
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 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -2196,6 +2196,8 @@ h264_vda_decoder_deps="vda" h264_vda_decoder_select="h264_decoder" h264_vda_hwaccel_deps="vda" h264_vda_hwaccel_select="h264_decoder" +h264_vda_old_hwaccel_deps="vda" +h264_vda_old_hwaccel_select="h264_decoder" h264_vdpau_decoder_deps="vdpau" h264_vdpau_decoder_select="h264_decoder" h264_vdpau_hwaccel_deps="vdpau" |