generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '654c7446a806c5dc8ec7800874c49a4c1ba2ce80'

Browse Source 
* commit '654c7446a806c5dc8ec7800874c49a4c1ba2ce80':
  vc1dec: improve hwaccel #ifdefs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-03-31 21:58:26 +02:00
commit 0f714abb49
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/vc1dec.c
View File

@ -6242,13 +6242,13 @@ static const AVProfile profiles[] = {
}; };
static const enum AVPixelFormat vc1_hwaccel_pixfmt_list_420[] = { static const enum AVPixelFormat vc1_hwaccel_pixfmt_list_420[] = {
#if CONFIG_DXVA2 #if CONFIG_VC1_DXVA2_HWACCEL
AV_PIX_FMT_DXVA2_VLD, AV_PIX_FMT_DXVA2_VLD,
#endif #endif
#if CONFIG_VAAPI #if CONFIG_VC1_VAAPI_HWACCEL
AV_PIX_FMT_VAAPI_VLD, AV_PIX_FMT_VAAPI_VLD,
#endif #endif
#if CONFIG_VDPAU #if CONFIG_VC1_VDPAU_HWACCEL
AV_PIX_FMT_VDPAU, AV_PIX_FMT_VDPAU,
#endif #endif
AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV420P,