[FFmpeg-cvslog] avcodec/libvpxdec: don' t check for formats other than i420 when vp9 decoding is disabled

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Sep 23 19:30:58 2014 -0300| [789274dca8e5c53bec5f32bb5df88f1323d85e11] | committer: James Almer

avcodec/libvpxdec: don't check for formats other than i420 when vp9 decoding is disabled

Should fix ticket #3958.

Reviewed-by: James Zern <jzern at google.com>
Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=789274dca8e5c53bec5f32bb5df88f1323d85e11
---

 libavcodec/libvpxdec.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/libvpxdec.c b/libavcodec/libvpxdec.c
index 8312460..65d391f 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;
     }