diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-31 21:58:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-31 22:04:25 +0200 |
| commit | 0f714abb49850fd43be207dc8c5a4bfab5a1999e (patch) | |
| tree | 0a8649a1e03e6df8bf10524f0c695dcc88ea174c /libavcodec | |
| parent | c43ebd94e4234cd075e23386205992aedd3f8573 (diff) | |
| parent | 654c7446a806c5dc8ec7800874c49a4c1ba2ce80 (diff) | |
| download | ffmpeg-0f714abb49850fd43be207dc8c5a4bfab5a1999e.tar.gz | |
Merge commit '654c7446a806c5dc8ec7800874c49a4c1ba2ce80'
* commit '654c7446a806c5dc8ec7800874c49a4c1ba2ce80':
vc1dec: improve hwaccel #ifdefs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vc1dec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 177cc59508..f44176fd72 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -6242,13 +6242,13 @@ static const AVProfile profiles[] = { }; static const enum AVPixelFormat vc1_hwaccel_pixfmt_list_420[] = { -#if CONFIG_DXVA2 +#if CONFIG_VC1_DXVA2_HWACCEL AV_PIX_FMT_DXVA2_VLD, #endif -#if CONFIG_VAAPI +#if CONFIG_VC1_VAAPI_HWACCEL AV_PIX_FMT_VAAPI_VLD, #endif -#if CONFIG_VDPAU +#if CONFIG_VC1_VDPAU_HWACCEL AV_PIX_FMT_VDPAU, #endif AV_PIX_FMT_YUV420P, |