[FFmpeg-cvslog] flacdec: do not warn on sample rate change

Justin Ruggles git at videolan.org
Fri Nov 2 14:32:39 CET 2012


ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Sun Oct 21 17:04:58 2012 -0400| [99d868635725e3b85a5c549e6bb0e97e10cf5248] | committer: Justin Ruggles

flacdec: do not warn on sample rate change

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=99d868635725e3b85a5c549e6bb0e97e10cf5248
---

 libavcodec/flacdec.c |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c
index 20af820..10e33f2 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) {



More information about the ffmpeg-cvslog mailing list