]> git.sesse.net Git - ffmpeg/commitdiff
flacdec: do not warn on sample rate change
authorJustin Ruggles <justin.ruggles@gmail.com>
Sun, 21 Oct 2012 21:04:58 +0000 (17:04 -0400)
committerJustin Ruggles <justin.ruggles@gmail.com>
Thu, 1 Nov 2012 15:29:16 +0000 (11:29 -0400)
libavcodec/flacdec.c

index 20af820a9dbea28d5342cb62b7ffea92df8f21fd..10e33f22f20d7703ae35988df5e12524dcaa1b34 100644 (file)
@@ -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) {