Index: source/libvpx/vp8/vp8_dx_iface.c |
diff --git a/source/libvpx/vp8/vp8_dx_iface.c b/source/libvpx/vp8/vp8_dx_iface.c |
index 72e4770c008d986b5d148ef828ce49fd2918a119..a73e83a1eba0900e72f99ce4196e4c43c5695032 100644 |
--- a/source/libvpx/vp8/vp8_dx_iface.c |
+++ b/source/libvpx/vp8/vp8_dx_iface.c |
@@ -42,8 +42,6 @@ typedef enum |
} mem_seg_id_t; |
#define NELEMENTS(x) ((int)(sizeof(x)/sizeof(x[0]))) |
-static unsigned long vp8_priv_sz(const vpx_codec_dec_cfg_t *si, vpx_codec_flags_t); |
- |
struct vpx_codec_alg_priv |
{ |
vpx_codec_priv_t base; |
@@ -68,18 +66,6 @@ struct vpx_codec_alg_priv |
FRAGMENT_DATA fragments; |
}; |
-static unsigned long vp8_priv_sz(const vpx_codec_dec_cfg_t *si, vpx_codec_flags_t flags) |
-{ |
- /* Although this declaration is constant, we can't use it in the requested |
- * segments list because we want to define the requested segments list |
- * before defining the private type (so that the number of memory maps is |
- * known) |
- */ |
- (void)si; |
- (void)flags; |
- return sizeof(vpx_codec_alg_priv_t); |
-} |
- |
static void vp8_init_ctx(vpx_codec_ctx_t *ctx) |
{ |
vpx_codec_alg_priv_t *priv = |
@@ -180,7 +166,7 @@ static vpx_codec_err_t vp8_peek_si_internal(const uint8_t *data, |
const uint8_t *clear = data; |
if (decrypt_cb) |
{ |
- int n = MIN(sizeof(clear_buffer), data_sz); |
+ int n = VPXMIN(sizeof(clear_buffer), data_sz); |
decrypt_cb(decrypt_state, data, clear_buffer, n); |
clear = clear_buffer; |
} |