Mercurial > libavcodec.hg
comparison flacdec.c @ 9238:11a79ab2279d libavcodec
flacdec: cosmetics: add some braces to if/else statements
| author | jbr |
|---|---|
| date | Sun, 22 Mar 2009 21:53:28 +0000 |
| parents | 69779b592b9d |
| children | af76987c8d53 |
comparison
equal
deleted
inserted
replaced
| 9237:69779b592b9d | 9238:11a79ab2279d |
|---|---|
| 510 return -1; | 510 return -1; |
| 511 } | 511 } |
| 512 | 512 |
| 513 /* bits per sample */ | 513 /* bits per sample */ |
| 514 bps_code = get_bits(gb, 3); | 514 bps_code = get_bits(gb, 3); |
| 515 if (bps_code == 0) | 515 if (bps_code == 0) { |
| 516 bps= s->bps; | 516 bps= s->bps; |
| 517 else if ((bps_code != 3) && (bps_code != 7)) | 517 } else if ((bps_code != 3) && (bps_code != 7)) { |
| 518 bps = sample_size_table[bps_code]; | 518 bps = sample_size_table[bps_code]; |
| 519 else { | 519 } else { |
| 520 av_log(s->avctx, AV_LOG_ERROR, "invalid sample size code (%d)\n", | 520 av_log(s->avctx, AV_LOG_ERROR, "invalid sample size code (%d)\n", |
| 521 bps_code); | 521 bps_code); |
| 522 return -1; | 522 return -1; |
| 523 } | 523 } |
| 524 if (bps > 16) { | 524 if (bps > 16) { |
| 546 | 546 |
| 547 /* blocksize */ | 547 /* blocksize */ |
| 548 if (bs_code == 0) { | 548 if (bs_code == 0) { |
| 549 av_log(s->avctx, AV_LOG_ERROR, "reserved blocksize code: 0\n"); | 549 av_log(s->avctx, AV_LOG_ERROR, "reserved blocksize code: 0\n"); |
| 550 return -1; | 550 return -1; |
| 551 } else if (bs_code == 6) | 551 } else if (bs_code == 6) { |
| 552 blocksize = get_bits(gb, 8)+1; | 552 blocksize = get_bits(gb, 8) + 1; |
| 553 else if (bs_code == 7) | 553 } else if (bs_code == 7) { |
| 554 blocksize = get_bits(gb, 16)+1; | 554 blocksize = get_bits(gb, 16) + 1; |
| 555 else | 555 } else { |
| 556 blocksize = ff_flac_blocksize_table[bs_code]; | 556 blocksize = ff_flac_blocksize_table[bs_code]; |
| 557 | 557 } |
| 558 if (blocksize > s->max_blocksize) { | 558 if (blocksize > s->max_blocksize) { |
| 559 av_log(s->avctx, AV_LOG_ERROR, "blocksize %d > %d\n", blocksize, | 559 av_log(s->avctx, AV_LOG_ERROR, "blocksize %d > %d\n", blocksize, |
| 560 s->max_blocksize); | 560 s->max_blocksize); |
| 561 return -1; | 561 return -1; |
| 562 } | 562 } |
| 563 | 563 |
| 564 /* sample rate */ | 564 /* sample rate */ |
| 565 if (sr_code == 0) | 565 if (sr_code == 0) { |
| 566 samplerate= s->samplerate; | 566 samplerate= s->samplerate; |
| 567 else if (sr_code < 12) | 567 } else if (sr_code < 12) { |
| 568 samplerate = ff_flac_sample_rate_table[sr_code]; | 568 samplerate = ff_flac_sample_rate_table[sr_code]; |
| 569 else if (sr_code == 12) | 569 } else if (sr_code == 12) { |
| 570 samplerate = get_bits(gb, 8) * 1000; | 570 samplerate = get_bits(gb, 8) * 1000; |
| 571 else if (sr_code == 13) | 571 } else if (sr_code == 13) { |
| 572 samplerate = get_bits(gb, 16); | 572 samplerate = get_bits(gb, 16); |
| 573 else if (sr_code == 14) | 573 } else if (sr_code == 14) { |
| 574 samplerate = get_bits(gb, 16) * 10; | 574 samplerate = get_bits(gb, 16) * 10; |
| 575 else { | 575 } else { |
| 576 av_log(s->avctx, AV_LOG_ERROR, "illegal sample rate code %d\n", | 576 av_log(s->avctx, AV_LOG_ERROR, "illegal sample rate code %d\n", |
| 577 sr_code); | 577 sr_code); |
| 578 return -1; | 578 return -1; |
| 579 } | 579 } |
| 580 | 580 |