From 926e9d28f1a85898545706a26b27c24672c9c716 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Sun, 21 Oct 2012 14:26:29 -0400 Subject: [PATCH] cook: remove unneeded COOKContext variable, sample_rate --- libavcodec/cook.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavcodec/cook.c b/libavcodec/cook.c index 7467749a6a..f6d2e664ab 100644 --- a/libavcodec/cook.c +++ b/libavcodec/cook.c @@ -126,7 +126,6 @@ typedef struct cook { AVFrame frame; GetBitContext gb; /* stream data */ - int sample_rate; int num_vectors; int samples_per_channel; /* states */ @@ -1024,7 +1023,7 @@ static void dump_cook_context(COOKContext *q) av_log(q->avctx, AV_LOG_ERROR, "COOKContext\n"); PRINT("nb_channels", q->avctx->channels); PRINT("bit_rate", q->avctx->bit_rate); - PRINT("sample_rate", q->sample_rate); + PRINT("sample_rate", q->avctx->sample_rate); PRINT("samples_per_channel", q->subpacket[0].samples_per_channel); PRINT("samples_per_frame", q->subpacket[0].samples_per_frame); PRINT("subbands", q->subpacket[0].subbands); @@ -1069,7 +1068,6 @@ static av_cold int cook_decode_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_DEBUG, "codecdata_length=%d\n", avctx->extradata_size); /* Take data from the AVCodecContext (RM container). */ - q->sample_rate = avctx->sample_rate; if (!avctx->channels) { av_log(avctx, AV_LOG_ERROR, "Invalid number of channels\n"); return AVERROR_INVALIDDATA;