diff options
| author | James Zern <jzern@google.com> | 2016-01-11 22:38:01 -0800 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2016-01-12 14:30:33 -0800 |
| commit | 1a876cc581e70990aaa9c6482bb8e6ea5b21071b (patch) | |
| tree | 640b87db61d10ce8c5d9784af3ca31ee224a22fb /libavcodec/libvpxdec.c | |
| parent | 57e4571679cdc265227e23154108960dd4176776 (diff) | |
| download | ffmpeg-1a876cc581e70990aaa9c6482bb8e6ea5b21071b.tar.gz | |
libvpxdec: fix 'ISO C90 forbids mixed declarations and code' warning
since:
cbcc88c libvpx: Support setting color range for vp9.
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Zern <jzern@google.com>
Diffstat (limited to 'libavcodec/libvpxdec.c')
| -rw-r--r-- | libavcodec/libvpxdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/libvpxdec.c b/libavcodec/libvpxdec.c index de72be9103..b51bfa2f43 100644 --- a/libavcodec/libvpxdec.c +++ b/libavcodec/libvpxdec.c @@ -68,13 +68,13 @@ static int set_pix_fmt(AVCodecContext *avctx, struct vpx_image *img) 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, }; - avctx->colorspace = colorspaces[img->cs]; #if VPX_IMAGE_ABI_VERSION >= 4 static const enum AVColorRange color_ranges[] = { AVCOL_RANGE_MPEG, AVCOL_RANGE_JPEG }; 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; |