diff options
author | John Koleszar <jkoleszar@google.com> | 2012-11-05 12:37:14 -0800 |
---|---|---|
committer | John Koleszar <jkoleszar@google.com> | 2012-11-06 12:04:53 -0800 |
commit | 83b1d907daef1db08834093806f125e56fba3370 (patch) | |
tree | 11831ecc5fd5612b5e3b47e342cd2d752c9abfc3 /vpx/vp8dx.h | |
parent | 807acf17baf7ba839ecc0038cdaee5d17964e612 (diff) | |
download | libvpx-83b1d907daef1db08834093806f125e56fba3370.tar libvpx-83b1d907daef1db08834093806f125e56fba3370.tar.gz libvpx-83b1d907daef1db08834093806f125e56fba3370.tar.bz2 libvpx-83b1d907daef1db08834093806f125e56fba3370.zip |
vpx: merge with master
Change-Id: I44b3ad780cef6f448fa17ff8e28fea87ef9cd518
Diffstat (limited to 'vpx/vp8dx.h')
-rw-r--r-- | vpx/vp8dx.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/vpx/vp8dx.h b/vpx/vp8dx.h index b076f51ea..a2c3a3928 100644 --- a/vpx/vp8dx.h +++ b/vpx/vp8dx.h @@ -20,8 +20,8 @@ * \brief Provides definitions for using the VP8 algorithm within the vpx Decoder * interface. */ -#ifndef VP9DX_H -#define VP9DX_H +#ifndef VP8DX_H +#define VP8DX_H #include "vpx_codec_impl_top.h" /*!\name Algorithm interface for VP8 @@ -54,6 +54,11 @@ enum vp8_dec_control_id { /** check if the indicated frame is corrupted */ VP8D_GET_FRAME_CORRUPTED, + /** control function to get info on which reference frames were used + * by the last decode + */ + VP8D_GET_LAST_REF_USED, + VP8_DECODER_CTRL_ID_MAX }; @@ -68,7 +73,7 @@ enum vp8_dec_control_id { VPX_CTRL_USE_TYPE(VP8D_GET_LAST_REF_UPDATES, int *) VPX_CTRL_USE_TYPE(VP8D_GET_FRAME_CORRUPTED, int *) - +VPX_CTRL_USE_TYPE(VP8D_GET_LAST_REF_USED, int *) /*! @} - end defgroup vp8_decoder */ |