diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2011-09-27 17:17:59 -0400 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2011-10-26 16:00:36 -0400 |
| commit | 402c98783d2818311dbfdd98f6287f27e9a4d809 (patch) | |
| tree | 00783c03d0493b9843d52c07f8f50d3a15bacc4f /libavcodec/libopencore-amr.c | |
| parent | 71ccfb3f14fdff783ff0f1a06ac37e4597f65bed (diff) | |
libopencore-amr: remove unneeded frame_count field.
Use AVCodecContext.frame_number instead.
Diffstat (limited to 'libavcodec/libopencore-amr.c')
| -rw-r--r-- | libavcodec/libopencore-amr.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libavcodec/libopencore-amr.c b/libavcodec/libopencore-amr.c index 484545fe67..22889bc240 100644 --- a/libavcodec/libopencore-amr.c +++ b/libavcodec/libopencore-amr.c @@ -79,7 +79,6 @@ static int get_bitrate_mode(int bitrate, void *log_ctx) typedef struct AMRContext { AVClass *av_class; - int frame_count; void *dec_state; void *enc_state; int enc_bitrate; @@ -100,7 +99,6 @@ static av_cold int amr_nb_decode_init(AVCodecContext *avctx) { AMRContext *s = avctx->priv_data; - s->frame_count = 0; s->dec_state = Decoder_Interface_init(); if (!s->dec_state) { av_log(avctx, AV_LOG_ERROR, "Decoder_Interface_init error\n"); @@ -136,7 +134,7 @@ static int amr_nb_decode_frame(AVCodecContext *avctx, void *data, int packet_size; av_dlog(avctx, "amr_decode_frame buf=%p buf_size=%d frame_count=%d!!\n", - buf, buf_size, s->frame_count); + buf, buf_size, avctx->frame_number); dec_mode = (buf[0] >> 3) & 0x000F; packet_size = block_size[dec_mode] + 1; @@ -147,7 +145,6 @@ static int amr_nb_decode_frame(AVCodecContext *avctx, void *data, return AVERROR_INVALIDDATA; } - s->frame_count++; av_dlog(avctx, "packet_size=%d buf= 0x%X %X %X %X\n", packet_size, buf[0], buf[1], buf[2], buf[3]); /* call decoder */ @@ -172,8 +169,6 @@ static av_cold int amr_nb_encode_init(AVCodecContext *avctx) { AMRContext *s = avctx->priv_data; - s->frame_count = 0; - if (avctx->sample_rate != 8000) { av_log(avctx, AV_LOG_ERROR, "Only 8000Hz sample rate supported\n"); return AVERROR(ENOSYS); |