| Index: source/libvpx/vpx/vp8dx.h
|
| ===================================================================
|
| --- source/libvpx/vpx/vp8dx.h (revision 172621)
|
| +++ source/libvpx/vpx/vp8dx.h (working copy)
|
| @@ -31,7 +31,11 @@
|
| * @{
|
| */
|
| extern vpx_codec_iface_t vpx_codec_vp8_dx_algo;
|
| -extern vpx_codec_iface_t* vpx_codec_vp8_dx(void);
|
| +extern vpx_codec_iface_t *vpx_codec_vp8_dx(void);
|
| +
|
| +/* TODO(jkoleszar): These move to VP9 in a later patch set. */
|
| +extern vpx_codec_iface_t vpx_codec_vp9_dx_algo;
|
| +extern vpx_codec_iface_t *vpx_codec_vp9_dx(void);
|
| /*!@} - end algorithm interface member group*/
|
|
|
| /* Include controls common to both the encoder and decoder */
|
| @@ -45,23 +49,22 @@
|
| *
|
| * \sa #vpx_codec_control
|
| */
|
| -enum vp8_dec_control_id
|
| -{
|
| - /** control function to get info on which reference frames were updated
|
| - * by the last decode
|
| - */
|
| - VP8D_GET_LAST_REF_UPDATES = VP8_DECODER_CTRL_ID_START,
|
| +enum vp8_dec_control_id {
|
| + /** control function to get info on which reference frames were updated
|
| + * by the last decode
|
| + */
|
| + VP8D_GET_LAST_REF_UPDATES = VP8_DECODER_CTRL_ID_START,
|
|
|
| - /** check if the indicated frame is corrupted */
|
| - VP8D_GET_FRAME_CORRUPTED,
|
| + /** 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,
|
| + /** 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
|
| -} ;
|
| + VP8_DECODER_CTRL_ID_MAX
|
| +};
|
|
|
|
|
| /*!\brief VP8 decoder control function parameter type
|
|
|