diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-31 21:49:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-31 21:50:24 +0200 |
| commit | c43ebd94e4234cd075e23386205992aedd3f8573 (patch) | |
| tree | c84343710056b99c7ba3c0e7d33691b87f2d3e81 /libavcodec | |
| parent | 4ea333d7deb03d788597ecfc1e64635e42756506 (diff) | |
| parent | 33259118155764ce27a3433894659dda1d148b5f (diff) | |
| download | ffmpeg-c43ebd94e4234cd075e23386205992aedd3f8573.tar.gz | |
Merge commit '33259118155764ce27a3433894659dda1d148b5f'
* commit '33259118155764ce27a3433894659dda1d148b5f':
h263: improve hwaccel #ifdefs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h263dec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 8fb3d38633..da7c397617 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -680,10 +680,10 @@ frame_end: } const enum AVPixelFormat ff_h263_hwaccel_pixfmt_list_420[] = { -#if CONFIG_VAAPI +#if CONFIG_H263_VAAPI_HWACCEL || CONFIG_MPEG4_VAAPI_HWACCEL AV_PIX_FMT_VAAPI_VLD, #endif -#if CONFIG_VDPAU +#if CONFIG_H263_VDPAU_HWACCEL || CONFIG_MPEG4_VDPAU_HWACCEL AV_PIX_FMT_VDPAU, #endif AV_PIX_FMT_YUV420P, |