mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-02-17 12:27:18 +00:00
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>
This commit is contained in:
parent
57e4571679
commit
1a876cc581
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user