Mercurial > libavcodec.hg

comparison flac.c @ 6715:273dd370ccbd libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove unused variable, min_framesize
author jbr
date Tue, 29 Apr 2008 01:29:35 +0000
parents a4104482ceef
children 08bdfd7f3ab4
comparison
equal deleted inserted replaced
6714:05c3a4b419e9 6715:273dd370ccbd
58 typedef struct FLACContext { 58 typedef struct FLACContext {
59 AVCodecContext *avctx; 59 AVCodecContext *avctx;
60 GetBitContext gb; 60 GetBitContext gb;
61 61
62 int min_blocksize, max_blocksize; 62 int min_blocksize, max_blocksize;
63 int min_framesize, max_framesize; 63 int max_framesize;
64 int samplerate, channels; 64 int samplerate, channels;
65 int blocksize/*, last_blocksize*/; 65 int blocksize/*, last_blocksize*/;
66 int bps, curr_bps; 66 int bps, curr_bps;
67 enum decorrelation_type decorrelation; 67 enum decorrelation_type decorrelation;
68 68
118 } 118 }
119 119
120 static void dump_headers(FLACContext *s) 120 static void dump_headers(FLACContext *s)
121 { 121 {
122 av_log(s->avctx, AV_LOG_DEBUG, " Blocksize: %d .. %d (%d)\n", s->min_blocksize, s->max_blocksize, s->blocksize); 122 av_log(s->avctx, AV_LOG_DEBUG, " Blocksize: %d .. %d (%d)\n", s->min_blocksize, s->max_blocksize, s->blocksize);
123 av_log(s->avctx, AV_LOG_DEBUG, " Framesize: %d .. %d\n", s->min_framesize, s->max_framesize); 123 av_log(s->avctx, AV_LOG_DEBUG, " Max Framesize: %d\n", s->max_framesize);
124 av_log(s->avctx, AV_LOG_DEBUG, " Samplerate: %d\n", s->samplerate); 124 av_log(s->avctx, AV_LOG_DEBUG, " Samplerate: %d\n", s->samplerate);
125 av_log(s->avctx, AV_LOG_DEBUG, " Channels: %d\n", s->channels); 125 av_log(s->avctx, AV_LOG_DEBUG, " Channels: %d\n", s->channels);
126 av_log(s->avctx, AV_LOG_DEBUG, " Bits: %d\n", s->bps); 126 av_log(s->avctx, AV_LOG_DEBUG, " Bits: %d\n", s->bps);
127 } 127 }
128 128
147 { 147 {
148 /* mandatory streaminfo */ 148 /* mandatory streaminfo */
149 s->min_blocksize = get_bits(&s->gb, 16); 149 s->min_blocksize = get_bits(&s->gb, 16);
150 s->max_blocksize = get_bits(&s->gb, 16); 150 s->max_blocksize = get_bits(&s->gb, 16);
151 151
152 s->min_framesize = get_bits_long(&s->gb, 24); 152 skip_bits(&s->gb, 24); /* skip min frame size */
153 s->max_framesize = get_bits_long(&s->gb, 24); 153 s->max_framesize = get_bits_long(&s->gb, 24);
154 154
155 s->samplerate = get_bits_long(&s->gb, 20); 155 s->samplerate = get_bits_long(&s->gb, 20);
156 s->channels = get_bits(&s->gb, 3) + 1; 156 s->channels = get_bits(&s->gb, 3) + 1;
157 s->bps = get_bits(&s->gb, 5) + 1; 157 s->bps = get_bits(&s->gb, 5) + 1;