diff options
| author | James Almer <jamrial@gmail.com> | 2014-09-23 19:30:58 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2014-09-23 19:50:28 -0300 |
| commit | 789274dca8e5c53bec5f32bb5df88f1323d85e11 (patch) | |
| tree | 0b6b001e09d9fae191aab31c356ecc700193a2e0 /libavcodec/libvpxdec.c | |
| parent | 00d3bb1a074b60fd9687679e4147f56d81886b05 (diff) | |
| download | ffmpeg-streaming-789274dca8e5c53bec5f32bb5df88f1323d85e11.zip ffmpeg-streaming-789274dca8e5c53bec5f32bb5df88f1323d85e11.tar.gz | |
avcodec/libvpxdec: don't check for formats other than i420 when vp9 decoding is disabled
Should fix ticket #3958.
Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/libvpxdec.c')
| -rw-r--r-- | libavcodec/libvpxdec.c | 2 |
1 files changed, 2 insertions, 0 deletions
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; } |
