Commit 959e0006 authored by Justin Ruggles's avatar Justin Ruggles

flacdec: add support for 3 additional sample rate codes

Originally committed as revision 16723 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 3c4ea6d5
......@@ -76,7 +76,8 @@ typedef struct FLACContext {
#define METADATA_TYPE_STREAMINFO 0
static const int sample_rate_table[] =
{ 0, 0, 0, 0,
{ 0,
88200, 176400, 192000,
8000, 16000, 22050, 24000, 32000, 44100, 48000, 96000,
0, 0, 0, 0 };
......@@ -558,7 +559,7 @@ static int decode_frame(FLACContext *s, int alloc_data_size)
if (sample_rate_code == 0){
samplerate= s->samplerate;
}else if ((sample_rate_code > 3) && (sample_rate_code < 12))
}else if (sample_rate_code < 12)
samplerate = sample_rate_table[sample_rate_code];
else if (sample_rate_code == 12)
samplerate = get_bits(&s->gb, 8) * 1000;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment