From 789274dca8e5c53bec5f32bb5df88f1323d85e11 Mon Sep 17 00:00:00 2001 From: James Almer Date: Tue, 23 Sep 2014 19:30:58 -0300 Subject: [PATCH] avcodec/libvpxdec: don't check for formats other than i420 when vp9 decoding is disabled Should fix ticket #3958. Reviewed-by: James Zern Signed-off-by: James Almer --- libavcodec/libvpxdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/libvpxdec.c b/libavcodec/libvpxdec.c index 8312460f53..65d391fcdc 100644 --- a/libavcodec/libvpxdec.c +++ b/libavcodec/libvpxdec.c @@ -68,6 +68,7 @@ static int set_pix_fmt(AVCodecContext *avctx, struct vpx_image *img) { case VPX_IMG_FMT_I420: avctx->pix_fmt = AV_PIX_FMT_YUV420P; return 0; +#if CONFIG_LIBVPX_VP9_DECODER case VPX_IMG_FMT_I422: avctx->pix_fmt = AV_PIX_FMT_YUV422P; return 0; @@ -106,6 +107,7 @@ static int set_pix_fmt(AVCodecContext *avctx, struct vpx_image *img) { return AVERROR_INVALIDDATA; } #endif +#endif default: return AVERROR_INVALIDDATA; } -- 2.11.0