virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-24 17:12:34 +02:00
Code Issues Releases Activity

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

Browse Source 
Should fix ticket #3958.

Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2014-09-23 19:30:58 -03:00
parent 00d3bb1a07
commit 789274dca8
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/libvpxdec.c
View File

@ -68,6 +68,7 @@ static int set_pix_fmt(AVCodecContext *avctx, struct vpx_image *img) {
case VPX_IMG_FMT_I420: case VPX_IMG_FMT_I420:
avctx->pix_fmt = AV_PIX_FMT_YUV420P; avctx->pix_fmt = AV_PIX_FMT_YUV420P;
return 0; return 0;
#if CONFIG_LIBVPX_VP9_DECODER
case VPX_IMG_FMT_I422: case VPX_IMG_FMT_I422:
avctx->pix_fmt = AV_PIX_FMT_YUV422P; avctx->pix_fmt = AV_PIX_FMT_YUV422P;
return 0; return 0;
@ -105,6 +106,7 @@ static int set_pix_fmt(AVCodecContext *avctx, struct vpx_image *img) {
} else { } else {
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
#endif
#endif #endif
default: default:
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;