Mercurial > libavcodec.hg
comparison flacdec.c @ 9249:353cfdb196e8 libavcodec
flacdec: cosmetics: white space
| author | jbr |
|---|---|
| date | Sun, 22 Mar 2009 23:22:44 +0000 |
| parents | f8973e93809a |
| children | 8d570fb097f8 |
comparison
equal
deleted
inserted
replaced
| 9248:f8973e93809a | 9249:353cfdb196e8 |
|---|---|
| 564 if (channels != s->channels) { | 564 if (channels != s->channels) { |
| 565 av_log(s->avctx, AV_LOG_ERROR, "switching channel layout mid-stream " | 565 av_log(s->avctx, AV_LOG_ERROR, "switching channel layout mid-stream " |
| 566 "is not supported\n"); | 566 "is not supported\n"); |
| 567 return -1; | 567 return -1; |
| 568 } | 568 } |
| 569 s->ch_mode = ch_mode; | 569 s->ch_mode = ch_mode; |
| 570 | 570 |
| 571 if (bps && bps != s->bps) { | 571 if (bps && bps != s->bps) { |
| 572 av_log(s->avctx, AV_LOG_ERROR, "switching bps mid-stream is not " | 572 av_log(s->avctx, AV_LOG_ERROR, "switching bps mid-stream is not " |
| 573 "supported\n"); | 573 "supported\n"); |
| 574 return -1; | 574 return -1; |
| 586 if (blocksize > s->max_blocksize) { | 586 if (blocksize > s->max_blocksize) { |
| 587 av_log(s->avctx, AV_LOG_ERROR, "blocksize %d > %d\n", blocksize, | 587 av_log(s->avctx, AV_LOG_ERROR, "blocksize %d > %d\n", blocksize, |
| 588 s->max_blocksize); | 588 s->max_blocksize); |
| 589 return -1; | 589 return -1; |
| 590 } | 590 } |
| 591 s->blocksize = blocksize; | 591 s->blocksize = blocksize; |
| 592 | 592 |
| 593 if (samplerate == 0) { | 593 if (samplerate == 0) { |
| 594 samplerate = s->samplerate; | 594 samplerate = s->samplerate; |
| 595 } else if (samplerate != s->samplerate) { | 595 } else if (samplerate != s->samplerate) { |
| 596 av_log(s->avctx, AV_LOG_WARNING, "sample rate changed from %d to %d\n", | 596 av_log(s->avctx, AV_LOG_WARNING, "sample rate changed from %d to %d\n", |
| 597 s->samplerate, samplerate); | 597 s->samplerate, samplerate); |
| 598 } | 598 } |
| 599 s->samplerate = s->avctx->sample_rate = samplerate; | 599 s->samplerate = s->avctx->sample_rate = samplerate; |
| 600 | 600 |
| 601 // dump_headers(s->avctx, (FLACStreaminfo *)s); | 601 // dump_headers(s->avctx, (FLACStreaminfo *)s); |
| 602 | 602 |
| 603 /* subframes */ | 603 /* subframes */ |
| 604 for (i = 0; i < s->channels; i++) { | 604 for (i = 0; i < s->channels; i++) { |