summaryrefslogtreecommitdiff
path: root/libavcodec/flacdec.c
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2012-10-21 17:04:58 -0400
committerJustin Ruggles <justin.ruggles@gmail.com>2012-11-01 11:29:16 -0400
commit99d868635725e3b85a5c549e6bb0e97e10cf5248 (patch)
tree8e5b786bfd56e6fa6c187356ad373cb88f72e5b2 /libavcodec/flacdec.c
parent90fcac0e95b7d266c148a86506f301a2072d9de3 (diff)
flacdec: do not warn on sample rate change
Diffstat (limited to 'libavcodec/flacdec.c')
-rw-r--r--libavcodec/flacdec.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c
index 20af820a9d..10e33f22f2 100644
--- a/libavcodec/flacdec.c
+++ b/libavcodec/flacdec.c
@@ -460,12 +460,8 @@ static int decode_frame(FLACContext *s)
" or frame header\n");
return -1;
}
- if (fi.samplerate == 0) {
+ if (fi.samplerate == 0)
fi.samplerate = s->samplerate;
- } else if (s->samplerate && fi.samplerate != s->samplerate) {
- av_log(s->avctx, AV_LOG_WARNING, "sample rate changed from %d to %d\n",
- s->samplerate, fi.samplerate);
- }
s->samplerate = s->avctx->sample_rate = fi.samplerate;
if (!s->got_streaminfo) {