diff options
Diffstat (limited to 'vpx/src/vpx_encoder.c')
| -rw-r--r-- | vpx/src/vpx_encoder.c | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/vpx/src/vpx_encoder.c b/vpx/src/vpx_encoder.c index a9a40de71..10929590b 100644 --- a/vpx/src/vpx_encoder.c +++ b/vpx/src/vpx_encoder.c @@ -1,10 +1,11 @@ /* - * Copyright (c) 2010 The VP8 project authors. All Rights Reserved. + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license and patent - * grant that can be found in the LICENSE file in the root of the source - * tree. All contributing project authors may be found in the AUTHORS - * file in the root of the source tree. + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. */ @@ -126,15 +127,6 @@ vpx_codec_err_t vpx_codec_encode(vpx_codec_ctx_t *ctx, res = VPX_CODEC_ERROR; else if (!(ctx->iface->caps & VPX_CODEC_CAP_ENCODER)) res = VPX_CODEC_INCAPABLE; - -#if CONFIG_EVAL_LIMIT - else if (ctx->priv->eval_counter >= 500) - { - ctx->priv->err_detail = "Evaluation limit exceeded."; - res = VPX_CODEC_ERROR; - } - -#endif else { /* Execute in a normalized floating point environment, if the platform @@ -144,10 +136,6 @@ vpx_codec_err_t vpx_codec_encode(vpx_codec_ctx_t *ctx, res = ctx->iface->enc.encode(ctx->priv->alg_priv, img, pts, duration, flags, deadline); FLOATING_POINT_RESTORE(); - -#if CONFIG_EVAL_LIMIT - ctx->priv->eval_counter++; -#endif } return SAVE_STATUS(ctx, res); @@ -315,7 +303,7 @@ const vpx_codec_cx_pkt_t *vpx_codec_pkt_list_get(struct vpx_codec_pkt_list *list pkt = (const void *) * iter; - if (pkt - list->pkts < list->cnt) + if ((size_t)(pkt - list->pkts) < list->cnt) *iter = pkt + 1; else pkt = NULL; |