diff options
| -rw-r--r-- | vp9/decoder/vp9_decodeframe.c | 4 | ||||
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 4 | ||||
| -rw-r--r-- | vp9/vp9_cx_iface.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index 9882940ae..ffc59a6ed 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c @@ -781,7 +781,7 @@ static void setup_frame_size_with_refs(VP9_COMMON *cm, cm->subsampling_x, cm->subsampling_y)) vpx_internal_error(&cm->error, VPX_CODEC_CORRUPT_FRAME, - "Referenced frame has incompatible color space"); + "Referenced frame has incompatible color format"); } resize_context_buffers(cm, width, height); @@ -1324,7 +1324,7 @@ static size_t read_uncompressed_header(VP9Decoder *pbi, } else { // NOTE: The intra-only frame header does not include the specification // of either the color format or color sub-sampling in profile 0. VP9 - // specifies that the default color space should be YUV 4:2:0 in this + // specifies that the default color format should be YUV 4:2:0 in this // case (normative). cm->color_space = BT_601; cm->subsampling_y = cm->subsampling_x = 1; diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index 49fe7def5..510be9649 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -3438,13 +3438,13 @@ int vp9_receive_raw_frame(VP9_COMP *cpi, unsigned int frame_flags, if ((cm->profile == PROFILE_0 || cm->profile == PROFILE_2) && (subsampling_x != 1 || subsampling_y != 1)) { vpx_internal_error(&cm->error, VPX_CODEC_INVALID_PARAM, - "Non-4:2:0 color space requires profile 1 or 3"); + "Non-4:2:0 color format requires profile 1 or 3"); res = -1; } if ((cm->profile == PROFILE_1 || cm->profile == PROFILE_3) && (subsampling_x == 1 && subsampling_y == 1)) { vpx_internal_error(&cm->error, VPX_CODEC_INVALID_PARAM, - "4:2:0 color space requires profile 0 or 2"); + "4:2:0 color format requires profile 0 or 2"); res = -1; } diff --git a/vp9/vp9_cx_iface.c b/vp9/vp9_cx_iface.c index 7b4b17809..531a03ebe 100644 --- a/vp9/vp9_cx_iface.c +++ b/vp9/vp9_cx_iface.c @@ -351,9 +351,9 @@ static int get_image_bps(const vpx_image_t *img) { } static vpx_codec_err_t set_encoder_config( - VP9EncoderConfig *oxcf, - const vpx_codec_enc_cfg_t *cfg, - const struct vp9_extracfg *extra_cfg) { + VP9EncoderConfig *oxcf, + const vpx_codec_enc_cfg_t *cfg, + const struct vp9_extracfg *extra_cfg) { const int is_vbr = cfg->rc_end_usage == VPX_VBR; oxcf->profile = cfg->g_profile; oxcf->max_threads = (int)cfg->g_threads; |