diff options
author | Frank Galligan <fgalligan@google.com> | 2014-01-24 11:31:23 -0800 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-01-24 11:31:23 -0800 |
commit | c6d537155c0eef7de973a09fdc5755e734f02042 (patch) | |
tree | 0e958076c33a11321123d4ab453d06507eaaf5b9 /vpx/src/vpx_decoder.c | |
parent | 9c0fbd573fcb051bfa2bdcc81b00b7d475cfe131 (diff) | |
parent | b1c72b633ef633a1ee6e83c3556393b6fe9068c4 (diff) | |
download | libvpx-c6d537155c0eef7de973a09fdc5755e734f02042.tar.gz libvpx-c6d537155c0eef7de973a09fdc5755e734f02042.tar.bz2 libvpx-c6d537155c0eef7de973a09fdc5755e734f02042.zip |
Merge "Revert external frame buffer code."
Diffstat (limited to 'vpx/src/vpx_decoder.c')
-rw-r--r-- | vpx/src/vpx_decoder.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/vpx/src/vpx_decoder.c b/vpx/src/vpx_decoder.c index 39fd217ea..a99e48f88 100644 --- a/vpx/src/vpx_decoder.c +++ b/vpx/src/vpx_decoder.c @@ -226,22 +226,3 @@ vpx_codec_err_t vpx_codec_set_mem_map(vpx_codec_ctx_t *ctx, return SAVE_STATUS(ctx, res); } - -vpx_codec_err_t vpx_codec_set_frame_buffers( - vpx_codec_ctx_t *ctx, - vpx_codec_frame_buffer_t *fb_list, int fb_count, - vpx_realloc_frame_buffer_cb_fn_t cb, void *user_priv) { - vpx_codec_err_t res; - - if (!ctx || !fb_list || fb_count <= 0 || !cb) { - res = VPX_CODEC_INVALID_PARAM; - } else if (!ctx->iface || !ctx->priv || - !(ctx->iface->caps & VPX_CODEC_CAP_EXTERNAL_FRAME_BUFFER)) { - res = VPX_CODEC_ERROR; - } else { - res = ctx->iface->dec.set_fb(ctx->priv->alg_priv, fb_list, fb_count, - cb, user_priv); - } - - return SAVE_STATUS(ctx, res); -} |