diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-07-27 00:05:06 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-07-27 00:05:06 -0400 |
| commit | 9fbb1d4350781f73d95fefcb3cce32bd04b57793 (patch) | |
| tree | 7a22e9f24d6e792eeb15a11f8cd9cdb916c44fd0 /vp8/common/onyxd.h | |
| parent | eccfca5165f24e322135898c079319030a8b7ecc (diff) | |
| parent | db8f0d2ca90929ac3e6fb63ef05651a71dd574ba (diff) | |
| download | libvpx-9fbb1d4350781f73d95fefcb3cce32bd04b57793.tar libvpx-9fbb1d4350781f73d95fefcb3cce32bd04b57793.tar.gz libvpx-9fbb1d4350781f73d95fefcb3cce32bd04b57793.tar.bz2 libvpx-9fbb1d4350781f73d95fefcb3cce32bd04b57793.zip | |
Merge remote branch 'origin/master' into experimental
Change-Id: I1ae82458536ba2f0969e1bea78f41cd16fe96b79
Diffstat (limited to 'vp8/common/onyxd.h')
| -rw-r--r-- | vp8/common/onyxd.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp8/common/onyxd.h b/vp8/common/onyxd.h index 2dfdc66da..d3e5c2fa7 100644 --- a/vp8/common/onyxd.h +++ b/vp8/common/onyxd.h @@ -54,8 +54,8 @@ extern "C" int vp8dx_get_setting(VP8D_PTR comp, VP8D_SETTING oxst); - int vp8dx_receive_compressed_data(VP8D_PTR comp, unsigned long size, const unsigned char *dest, INT64 time_stamp); - int vp8dx_get_raw_frame(VP8D_PTR comp, YV12_BUFFER_CONFIG *sd, INT64 *time_stamp, INT64 *time_end_stamp, vp8_ppflags_t *flags); + int vp8dx_receive_compressed_data(VP8D_PTR comp, unsigned long size, const unsigned char *dest, int64_t time_stamp); + int vp8dx_get_raw_frame(VP8D_PTR comp, YV12_BUFFER_CONFIG *sd, int64_t *time_stamp, int64_t *time_end_stamp, vp8_ppflags_t *flags); vpx_codec_err_t vp8dx_get_reference(VP8D_PTR comp, VP8_REFFRAME ref_frame_flag, YV12_BUFFER_CONFIG *sd); vpx_codec_err_t vp8dx_set_reference(VP8D_PTR comp, VP8_REFFRAME ref_frame_flag, YV12_BUFFER_CONFIG *sd); |