diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-07-26 12:57:43 -0700 |
|---|---|---|
| committer | Code Review <code-review@webmproject.org> | 2011-07-26 12:57:43 -0700 |
| commit | db8f0d2ca90929ac3e6fb63ef05651a71dd574ba (patch) | |
| tree | 4a7abc35836c441d9ed697ce860af69a42edd99c /vp8/decoder | |
| parent | ca7e346669ce7d9a410edc19a828f9ca9637626d (diff) | |
| parent | b45065d38b5ccbf6a34b697edf5021fe00171f24 (diff) | |
| download | libvpx-db8f0d2ca90929ac3e6fb63ef05651a71dd574ba.tar libvpx-db8f0d2ca90929ac3e6fb63ef05651a71dd574ba.tar.gz libvpx-db8f0d2ca90929ac3e6fb63ef05651a71dd574ba.tar.bz2 libvpx-db8f0d2ca90929ac3e6fb63ef05651a71dd574ba.zip | |
Merge "cosmetics: consistently use [u]int64_t"
Diffstat (limited to 'vp8/decoder')
| -rw-r--r-- | vp8/decoder/onyxd_if.c | 16 | ||||
| -rw-r--r-- | vp8/decoder/onyxd_int.h | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/vp8/decoder/onyxd_if.c b/vp8/decoder/onyxd_if.c index 829a675a7..224619480 100644 --- a/vp8/decoder/onyxd_if.c +++ b/vp8/decoder/onyxd_if.c @@ -204,8 +204,8 @@ vpx_codec_err_t vp8dx_set_reference(VP8D_PTR ptr, VP8_REFFRAME ref_frame_flag, Y /*For ARM NEON, d8-d15 are callee-saved registers, and need to be saved by us.*/ #if HAVE_ARMV7 -extern void vp8_push_neon(INT64 *store); -extern void vp8_pop_neon(INT64 *store); +extern void vp8_push_neon(int64_t *store); +extern void vp8_pop_neon(int64_t *store); #endif static int get_free_fb (VP8_COMMON *cm) @@ -288,10 +288,10 @@ static int swap_frame_buffers (VP8_COMMON *cm) return err; } -int vp8dx_receive_compressed_data(VP8D_PTR ptr, unsigned long size, const unsigned char *source, INT64 time_stamp) +int vp8dx_receive_compressed_data(VP8D_PTR ptr, unsigned long size, const unsigned char *source, int64_t time_stamp) { #if HAVE_ARMV7 - INT64 dx_store_reg[8]; + int64_t dx_store_reg[8]; #endif VP8D_COMP *pbi = (VP8D_COMP *) ptr; VP8_COMMON *cm = &pbi->common; @@ -495,9 +495,9 @@ int vp8dx_receive_compressed_data(VP8D_PTR ptr, unsigned long size, const unsign #if 0 { int i; - INT64 earliest_time = pbi->dr[0].time_stamp; - INT64 latest_time = pbi->dr[0].time_stamp; - INT64 time_diff = 0; + int64_t earliest_time = pbi->dr[0].time_stamp; + int64_t latest_time = pbi->dr[0].time_stamp; + int64_t time_diff = 0; int bytes = 0; pbi->dr[pbi->common.current_video_frame&0xf].size = pbi->bc.pos + pbi->bc2.pos + 4;; @@ -537,7 +537,7 @@ int vp8dx_receive_compressed_data(VP8D_PTR ptr, unsigned long size, const unsign pbi->common.error.setjmp = 0; return retcode; } -int vp8dx_get_raw_frame(VP8D_PTR ptr, YV12_BUFFER_CONFIG *sd, INT64 *time_stamp, INT64 *time_end_stamp, vp8_ppflags_t *flags) +int vp8dx_get_raw_frame(VP8D_PTR ptr, YV12_BUFFER_CONFIG *sd, int64_t *time_stamp, int64_t *time_end_stamp, vp8_ppflags_t *flags) { int ret = -1; VP8D_COMP *pbi = (VP8D_COMP *) ptr; diff --git a/vp8/decoder/onyxd_int.h b/vp8/decoder/onyxd_int.h index 4e8da50df..eac57ab35 100644 --- a/vp8/decoder/onyxd_int.h +++ b/vp8/decoder/onyxd_int.h @@ -38,7 +38,7 @@ typedef struct typedef struct { - INT64 time_stamp; + int64_t time_stamp; int size; } DATARATE; @@ -109,7 +109,7 @@ typedef struct VP8Decompressor #endif vp8_reader *mbc; - INT64 last_time_stamp; + int64_t last_time_stamp; int ready_for_new_data; DATARATE dr[16]; |