diff options
| author | John Koleszar <jkoleszar@google.com> | 2012-12-14 12:35:33 -0800 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2012-12-17 11:32:37 -0800 |
| commit | 1306ba765913c90609e8a41ee0890352f62ddb05 (patch) | |
| tree | 9c42b434b3f7394e4df0a609681e434d20d4b81d /vp9/decoder/vp9_detokenize.c | |
| parent | 2b9ec585d6469b4a8031f3326039bfdc2894ccff (diff) | |
| download | libvpx-1306ba765913c90609e8a41ee0890352f62ddb05.tar libvpx-1306ba765913c90609e8a41ee0890352f62ddb05.tar.gz libvpx-1306ba765913c90609e8a41ee0890352f62ddb05.tar.bz2 libvpx-1306ba765913c90609e8a41ee0890352f62ddb05.zip | |
Remove vp9_type_aliases.h
Prefer the standard fixed-size integer typedefs.
Change-Id: Iad75582350669e49a8da3b7facb9c259e9514a5b
Diffstat (limited to 'vp9/decoder/vp9_detokenize.c')
| -rw-r--r-- | vp9/decoder/vp9_detokenize.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/vp9/decoder/vp9_detokenize.c b/vp9/decoder/vp9_detokenize.c index 1e3608fb2..5e5861aad 100644 --- a/vp9/decoder/vp9_detokenize.c +++ b/vp9/decoder/vp9_detokenize.c @@ -9,7 +9,6 @@ */ -#include "vp9/common/vp9_type_aliases.h" #include "vp9/common/vp9_blockd.h" #include "vp9/decoder/vp9_onyxd_int.h" #include "vpx_mem/vpx_mem.h" @@ -91,7 +90,7 @@ static int get_signed(BOOL_DECODER *br, int value_to_sign) { #define WRITE_COEF_CONTINUE(val, token) \ { \ - qcoeff_ptr[scan[c]] = (INT16) get_signed(br, val); \ + qcoeff_ptr[scan[c]] = (int16_t) get_signed(br, val); \ INCREMENT_COUNT(token); \ c++; \ continue; \ @@ -100,7 +99,7 @@ static int get_signed(BOOL_DECODER *br, int value_to_sign) { #define ADJUST_COEF(prob, bits_count) \ do { \ if (vp9_read(br, prob)) \ - val += (UINT16)(1 << bits_count);\ + val += (uint16_t)(1 << bits_count);\ } while (0); static int decode_coefs(VP9D_COMP *dx, const MACROBLOCKD *xd, @@ -108,7 +107,7 @@ static int decode_coefs(VP9D_COMP *dx, const MACROBLOCKD *xd, ENTROPY_CONTEXT *a, ENTROPY_CONTEXT *l, PLANE_TYPE type, TX_TYPE tx_type, - int seg_eob, INT16 *qcoeff_ptr, + int seg_eob, int16_t *qcoeff_ptr, const int *const scan, TX_SIZE txfm_size, const int *coef_bands) { FRAME_CONTEXT *const fc = &dx->common.fc; |