diff options
author | Paul Wilkins <paulwilkins@google.com> | 2012-02-28 02:07:49 +0000 |
---|---|---|
committer | On2 (Google) Code Review <on2-gerrit@google.com> | 2012-02-28 02:07:49 +0000 |
commit | 3cdd0a8e75111393bc1d03da6c0c2ca01c959b92 (patch) | |
tree | 4351dabcfdb13eb3febc19976b459f65a16d9e36 /vp8/encoder | |
parent | 88a867c6dd319b7606711cc6120bed511a8f7c08 (diff) | |
parent | b00ed02a165e7e605d519a92db2aca92629325f8 (diff) | |
download | libvpx-3cdd0a8e75111393bc1d03da6c0c2ca01c959b92.tar libvpx-3cdd0a8e75111393bc1d03da6c0c2ca01c959b92.tar.gz libvpx-3cdd0a8e75111393bc1d03da6c0c2ca01c959b92.tar.bz2 libvpx-3cdd0a8e75111393bc1d03da6c0c2ca01c959b92.zip |
Merge "Corrected spelling" into experimental
Diffstat (limited to 'vp8/encoder')
-rw-r--r-- | vp8/encoder/bitstream.c | 2 | ||||
-rw-r--r-- | vp8/encoder/onyx_if.c | 4 | ||||
-rw-r--r-- | vp8/encoder/quantize.c | 2 | ||||
-rw-r--r-- | vp8/encoder/segmentation.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/vp8/encoder/bitstream.c b/vp8/encoder/bitstream.c index ff83794c1..b8020af22 100644 --- a/vp8/encoder/bitstream.c +++ b/vp8/encoder/bitstream.c @@ -2543,7 +2543,7 @@ void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned long *size) { signed char Data; - vp8_write_bit(bc, (xd->mb_segement_abs_delta) ? 1 : 0); + vp8_write_bit(bc, (xd->mb_segment_abs_delta) ? 1 : 0); // For each segments id... for (i = 0; i < MAX_MB_SEGMENTS; i++) diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 834819125..394b75657 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -454,7 +454,7 @@ static void init_seg_features(VP8_COMP *cpi) enable_segfeature(xd, 1, SEG_LVL_ALT_LF); // Where relevant assume segment data is delta data - xd->mb_segement_abs_delta = SEGMENT_DELTADATA; + xd->mb_segment_abs_delta = SEGMENT_DELTADATA; } } @@ -484,7 +484,7 @@ static void init_seg_features(VP8_COMP *cpi) { xd->update_mb_segmentation_map = 0; xd->update_mb_segmentation_data = 1; - xd->mb_segement_abs_delta = SEGMENT_DELTADATA; + xd->mb_segment_abs_delta = SEGMENT_DELTADATA; qi_delta = compute_qdelta( cpi, cpi->avg_q, (cpi->avg_q * 1.125) ); diff --git a/vp8/encoder/quantize.c b/vp8/encoder/quantize.c index 3b22e57b2..7ea712f7f 100644 --- a/vp8/encoder/quantize.c +++ b/vp8/encoder/quantize.c @@ -1100,7 +1100,7 @@ void vp8cx_mb_init_quantizer(VP8_COMP *cpi, MACROBLOCK *x) if ( segfeature_active( xd, segment_id, SEG_LVL_ALT_Q ) ) { // Abs Value - if (xd->mb_segement_abs_delta == SEGMENT_ABSDATA) + if (xd->mb_segment_abs_delta == SEGMENT_ABSDATA) QIndex = get_segdata( xd, segment_id, SEG_LVL_ALT_Q ); // Delta Value diff --git a/vp8/encoder/segmentation.c b/vp8/encoder/segmentation.c index c4a147558..c36246a02 100644 --- a/vp8/encoder/segmentation.c +++ b/vp8/encoder/segmentation.c @@ -106,7 +106,7 @@ void vp8_set_segment_data(VP8_PTR ptr, { VP8_COMP *cpi = (VP8_COMP *)(ptr); - cpi->mb.e_mbd.mb_segement_abs_delta = abs_delta; + cpi->mb.e_mbd.mb_segment_abs_delta = abs_delta; vpx_memcpy(cpi->mb.e_mbd.segment_feature_data, feature_data, sizeof(cpi->mb.e_mbd.segment_feature_data)); |