xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-28 22:10:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cook: remove unneeded COOKContext variable, sample_rate

Browse Source
This commit is contained in:
Justin Ruggles 2012-10-21 14:26:29 -04:00
parent 8aa5b8c5c8
commit 926e9d28f1
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/cook.c
View File

@ -126,7 +126,6 @@ typedef struct cook {
AVFrame frame; AVFrame frame;
GetBitContext gb; GetBitContext gb;
/* stream data */ /* stream data */
int sample_rate;
int num_vectors; int num_vectors;
int samples_per_channel; int samples_per_channel;
/* states */ /* states */
@ -1024,7 +1023,7 @@ static void dump_cook_context(COOKContext *q)
av_log(q->avctx, AV_LOG_ERROR, "COOKContext\n"); av_log(q->avctx, AV_LOG_ERROR, "COOKContext\n");
PRINT("nb_channels", q->avctx->channels); PRINT("nb_channels", q->avctx->channels);
PRINT("bit_rate", q->avctx->bit_rate); 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_channel", q->subpacket[0].samples_per_channel);
PRINT("samples_per_frame", q->subpacket[0].samples_per_frame); PRINT("samples_per_frame", q->subpacket[0].samples_per_frame);
PRINT("subbands", q->subpacket[0].subbands); 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); av_log(avctx, AV_LOG_DEBUG, "codecdata_length=%d\n", avctx->extradata_size);
/* Take data from the AVCodecContext (RM container). */ /* Take data from the AVCodecContext (RM container). */
q->sample_rate = avctx->sample_rate;
if (!avctx->channels) { if (!avctx->channels) {
av_log(avctx, AV_LOG_ERROR, "Invalid number of channels\n"); av_log(avctx, AV_LOG_ERROR, "Invalid number of channels\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;