From e60dbe421c7e9cd896d33e35a6a1b0cef953918e Mon Sep 17 00:00:00 2001 From: James Zern Date: Fri, 17 Nov 2017 17:25:59 -0800 Subject: [PATCH] libvpxdec: remove pre-1.4.0 checks Reviewed-by: James Almer Signed-off-by: James Zern --- libavcodec/libvpxdec.c | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/libavcodec/libvpxdec.c b/libavcodec/libvpxdec.c index ad0ea3b02a..2ae29d202a 100644 --- a/libavcodec/libvpxdec.c +++ b/libavcodec/libvpxdec.c @@ -70,7 +70,6 @@ static av_cold int vpx_init(AVCodecContext *avctx, static int set_pix_fmt(AVCodecContext *avctx, struct vpx_image *img, int has_alpha_channel) { -#if VPX_IMAGE_ABI_VERSION >= 3 static const enum AVColorSpace colorspaces[8] = { AVCOL_SPC_UNSPECIFIED, AVCOL_SPC_BT470BG, AVCOL_SPC_BT709, AVCOL_SPC_SMPTE170M, AVCOL_SPC_SMPTE240M, AVCOL_SPC_BT2020_NCL, AVCOL_SPC_RESERVED, AVCOL_SPC_RGB, @@ -82,7 +81,6 @@ static int set_pix_fmt(AVCodecContext *avctx, struct vpx_image *img, avctx->color_range = color_ranges[img->range]; #endif avctx->colorspace = colorspaces[img->cs]; -#endif if (avctx->codec_id == AV_CODEC_ID_VP8 && img->fmt != VPX_IMG_FMT_I420) return AVERROR_INVALIDDATA; switch (img->fmt) { @@ -97,22 +95,15 @@ static int set_pix_fmt(AVCodecContext *avctx, struct vpx_image *img, avctx->profile = FF_PROFILE_VP9_1; avctx->pix_fmt = AV_PIX_FMT_YUV422P; return 0; -#if VPX_IMAGE_ABI_VERSION >= 3 case VPX_IMG_FMT_I440: avctx->profile = FF_PROFILE_VP9_1; avctx->pix_fmt = AV_PIX_FMT_YUV440P; return 0; -#endif case VPX_IMG_FMT_I444: avctx->profile = FF_PROFILE_VP9_1; -#if VPX_IMAGE_ABI_VERSION >= 3 avctx->pix_fmt = avctx->colorspace == AVCOL_SPC_RGB ? AV_PIX_FMT_GBRP : AV_PIX_FMT_YUV444P; -#else - avctx->pix_fmt = AV_PIX_FMT_YUV444P; -#endif return 0; -#ifdef VPX_IMG_FMT_HIGHBITDEPTH case VPX_IMG_FMT_I42016: avctx->profile = FF_PROFILE_VP9_2; if (img->bit_depth == 10) { @@ -135,7 +126,6 @@ static int set_pix_fmt(AVCodecContext *avctx, struct vpx_image *img, } else { return AVERROR_INVALIDDATA; } -#if VPX_IMAGE_ABI_VERSION >= 3 case VPX_IMG_FMT_I44016: avctx->profile = FF_PROFILE_VP9_3; if (img->bit_depth == 10) { @@ -147,29 +137,19 @@ static int set_pix_fmt(AVCodecContext *avctx, struct vpx_image *img, } else { return AVERROR_INVALIDDATA; } -#endif case VPX_IMG_FMT_I44416: avctx->profile = FF_PROFILE_VP9_3; if (img->bit_depth == 10) { -#if VPX_IMAGE_ABI_VERSION >= 3 avctx->pix_fmt = avctx->colorspace == AVCOL_SPC_RGB ? AV_PIX_FMT_GBRP10 : AV_PIX_FMT_YUV444P10; -#else - avctx->pix_fmt = AV_PIX_FMT_YUV444P10; -#endif return 0; } else if (img->bit_depth == 12) { -#if VPX_IMAGE_ABI_VERSION >= 3 avctx->pix_fmt = avctx->colorspace == AVCOL_SPC_RGB ? AV_PIX_FMT_GBRP12 : AV_PIX_FMT_YUV444P12; -#else - avctx->pix_fmt = AV_PIX_FMT_YUV444P12; -#endif return 0; } else { return AVERROR_INVALIDDATA; } -#endif #endif default: return AVERROR_INVALIDDATA; @@ -252,13 +232,8 @@ static int vpx_decode(AVCodecContext *avctx, } if ((ret = set_pix_fmt(avctx, img, ctx->has_alpha_channel)) < 0) { -#ifdef VPX_IMG_FMT_HIGHBITDEPTH av_log(avctx, AV_LOG_ERROR, "Unsupported output colorspace (%d) / bit_depth (%d)\n", img->fmt, img->bit_depth); -#else - av_log(avctx, AV_LOG_ERROR, "Unsupported output colorspace (%d) / bit_depth (%d)\n", - img->fmt, 8); -#endif return ret; }