# HG changeset patch # User jbr # Date 1237761486 0 # Node ID cbf65173eed3167fa0578c548dcf51e17ed24521 # Parent c09443000c4b012d50613755605ddf8e87c24951 flacdec: allow sample rate to change mid-stream, but log a warning message when it does diff -r c09443000c4b -r cbf65173eed3 flacdec.c --- a/flacdec.c Sun Mar 22 22:33:41 2009 +0000 +++ b/flacdec.c Sun Mar 22 22:38:06 2009 +0000 @@ -563,9 +563,7 @@ } /* sample rate */ - if (sr_code == 0) { - samplerate= s->samplerate; - } else if (sr_code < 12) { + if (sr_code < 12) { samplerate = ff_flac_sample_rate_table[sr_code]; } else if (sr_code == 12) { samplerate = get_bits(gb, 8) * 1000; @@ -578,6 +576,12 @@ sr_code); return -1; } + if (samplerate == 0) { + samplerate = s->samplerate; + } else if (samplerate != s->samplerate) { + av_log(s->avctx, AV_LOG_WARNING, "sample rate changed from %d to %d\n", + s->samplerate, samplerate); + } /* header CRC-8 check */ skip_bits(gb, 8); @@ -588,7 +592,7 @@ } s->blocksize = blocksize; - s->samplerate = samplerate; + s->samplerate = s->avctx->sample_rate = samplerate; s->bps = bps; s->ch_mode = ch_mode;