Commit 61cdb0d9 authored by jbr's avatar jbr

flacdec: cosmetics: add some braces to if/else statements


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18156 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 9589326c
...@@ -512,11 +512,11 @@ static int decode_frame(FLACContext *s) ...@@ -512,11 +512,11 @@ static int decode_frame(FLACContext *s)
/* bits per sample */ /* bits per sample */
bps_code = get_bits(gb, 3); bps_code = get_bits(gb, 3);
if (bps_code == 0) if (bps_code == 0) {
bps= s->bps; bps= s->bps;
else if ((bps_code != 3) && (bps_code != 7)) } else if ((bps_code != 3) && (bps_code != 7)) {
bps = sample_size_table[bps_code]; bps = sample_size_table[bps_code];
else { } else {
av_log(s->avctx, AV_LOG_ERROR, "invalid sample size code (%d)\n", av_log(s->avctx, AV_LOG_ERROR, "invalid sample size code (%d)\n",
bps_code); bps_code);
return -1; return -1;
...@@ -548,13 +548,13 @@ static int decode_frame(FLACContext *s) ...@@ -548,13 +548,13 @@ static int decode_frame(FLACContext *s)
if (bs_code == 0) { if (bs_code == 0) {
av_log(s->avctx, AV_LOG_ERROR, "reserved blocksize code: 0\n"); av_log(s->avctx, AV_LOG_ERROR, "reserved blocksize code: 0\n");
return -1; return -1;
} else if (bs_code == 6) } else if (bs_code == 6) {
blocksize = get_bits(gb, 8)+1; blocksize = get_bits(gb, 8) + 1;
else if (bs_code == 7) } else if (bs_code == 7) {
blocksize = get_bits(gb, 16)+1; blocksize = get_bits(gb, 16) + 1;
else } else {
blocksize = ff_flac_blocksize_table[bs_code]; blocksize = ff_flac_blocksize_table[bs_code];
}
if (blocksize > s->max_blocksize) { if (blocksize > s->max_blocksize) {
av_log(s->avctx, AV_LOG_ERROR, "blocksize %d > %d\n", blocksize, av_log(s->avctx, AV_LOG_ERROR, "blocksize %d > %d\n", blocksize,
s->max_blocksize); s->max_blocksize);
...@@ -562,17 +562,17 @@ static int decode_frame(FLACContext *s) ...@@ -562,17 +562,17 @@ static int decode_frame(FLACContext *s)
} }
/* sample rate */ /* sample rate */
if (sr_code == 0) if (sr_code == 0) {
samplerate= s->samplerate; samplerate= s->samplerate;
else if (sr_code < 12) } else if (sr_code < 12) {
samplerate = ff_flac_sample_rate_table[sr_code]; samplerate = ff_flac_sample_rate_table[sr_code];
else if (sr_code == 12) } else if (sr_code == 12) {
samplerate = get_bits(gb, 8) * 1000; samplerate = get_bits(gb, 8) * 1000;
else if (sr_code == 13) } else if (sr_code == 13) {
samplerate = get_bits(gb, 16); samplerate = get_bits(gb, 16);
else if (sr_code == 14) } else if (sr_code == 14) {
samplerate = get_bits(gb, 16) * 10; samplerate = get_bits(gb, 16) * 10;
else { } else {
av_log(s->avctx, AV_LOG_ERROR, "illegal sample rate code %d\n", av_log(s->avctx, AV_LOG_ERROR, "illegal sample rate code %d\n",
sr_code); sr_code);
return -1; return -1;
......
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