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/h264_slice.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/h264_slice.c')
| -rw-r--r-- | libavcodec/h264_slice.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 7969d2c5cd..49af2c13d0 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -157,6 +157,7 @@ static const enum AVPixelFormat h264_hwaccel_pixfmt_list_420[] = { #endif #if CONFIG_H264_VDA_HWACCEL AV_PIX_FMT_VDA_VLD, + AV_PIX_FMT_VDA, #endif #if CONFIG_H264_VDPAU_HWACCEL AV_PIX_FMT_VDPAU, @@ -174,6 +175,7 @@ static const enum AVPixelFormat h264_hwaccel_pixfmt_list_jpeg_420[] = { #endif #if CONFIG_H264_VDA_HWACCEL AV_PIX_FMT_VDA_VLD, + AV_PIX_FMT_VDA, #endif #if CONFIG_H264_VDPAU_HWACCEL AV_PIX_FMT_VDPAU, |