diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-24 12:39:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-24 12:39:21 +0200 |
| commit | 49038fc17dd09a94185c787f02479d190894e470 (patch) | |
| tree | 0b6a203e3393f68719e81ee4cf943df11cdeec01 | |
| parent | 7e63a622d14a2bc13f50ec18a0453c74ad674e44 (diff) | |
| parent | 41740ef8be6ec409f7eff3932ddba9a9eeec27b1 (diff) | |
| download | ffmpeg-49038fc17dd09a94185c787f02479d190894e470.tar.gz | |
Merge commit '41740ef8be6ec409f7eff3932ddba9a9eeec27b1'
* commit '41740ef8be6ec409f7eff3932ddba9a9eeec27b1':
libvpx: fix test for VPX_IMAGE_ABI_VERSION
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/libvpx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/libvpx.c b/libavcodec/libvpx.c index 602eb70f45..5aa27ab8f9 100644 --- a/libavcodec/libvpx.c +++ b/libavcodec/libvpx.c @@ -96,7 +96,7 @@ enum AVPixelFormat ff_vpx_imgfmt_to_pixfmt(vpx_img_fmt_t img) case VPX_IMG_FMT_I422: return AV_PIX_FMT_YUV422P; case VPX_IMG_FMT_I444: return AV_PIX_FMT_YUV444P; case VPX_IMG_FMT_444A: return AV_PIX_FMT_YUVA444P; -#ifdef VPX_IMAGE_ABI_VERSION >= 3 +#if VPX_IMAGE_ABI_VERSION >= 3 case VPX_IMG_FMT_I440: return AV_PIX_FMT_YUV440P; case VPX_IMG_FMT_I42016: return AV_PIX_FMT_YUV420P16BE; case VPX_IMG_FMT_I42216: return AV_PIX_FMT_YUV422P16BE; @@ -124,7 +124,7 @@ vpx_img_fmt_t ff_vpx_pixfmt_to_imgfmt(enum AVPixelFormat pix) case AV_PIX_FMT_YUV422P: return VPX_IMG_FMT_I422; case AV_PIX_FMT_YUV444P: return VPX_IMG_FMT_I444; case AV_PIX_FMT_YUVA444P: return VPX_IMG_FMT_444A; -#ifdef VPX_IMAGE_ABI_VERSION >= 3 +#if VPX_IMAGE_ABI_VERSION >= 3 case AV_PIX_FMT_YUV440P: return VPX_IMG_FMT_I440; case AV_PIX_FMT_YUV420P16BE: return VPX_IMG_FMT_I42016; case AV_PIX_FMT_YUV422P16BE: return VPX_IMG_FMT_I42216; |