[FFmpeg-cvslog] ffmpeg: fix changing sample rate handling

Michael Niedermayer git at videolan.org
Thu Dec 1 04:26:08 CET 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Dec  1 04:06:59 2011 +0100| [03b60509cb929efce8bf9de0249682cd3e2de963] | committer: Michael Niedermayer

ffmpeg: fix changing sample rate handling

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 ffmpeg.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 2e8aae0..f87ab63 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -876,7 +876,9 @@ need_realloc:
     }
 
     if (enc->channels != dec->channels
-     || enc->sample_fmt != dec->sample_fmt)
+     || enc->sample_fmt != dec->sample_fmt
+     || enc->sample_rate!= dec->sample_rate
+    )
         ost->audio_resample = 1;
 
     resample_changed = ost->resample_sample_fmt  != dec->sample_fmt ||



More information about the ffmpeg-cvslog mailing list