[FFmpeg-cvslog] swr: skip soft compensation when its disabled.

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat May 19 22:42:32 2012 +0200| [d1384c00d4882712816612d82289be240c508779] | committer: Michael Niedermayer

swr: skip soft compensation when its disabled.

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

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

 libswresample/swresample.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index dcc9a28..60706d3 100644
--- a/libswresample/swresample.c
+++ b/libswresample/swresample.c
@@ -761,7 +761,7 @@ int64_t swr_next_pts(struct SwrContext *s, int64_t pts){
             if(!s->outpts || fabs(fdelta) > s->min_hard_compensation){
                 if(delta > 0) swr_inject_silence(s,  delta / s->out_sample_rate);
                 else          swr_drop_output   (s, -delta / s-> in_sample_rate);
-            } else {
+            } else if(s->soft_compensation_duration && s->max_soft_compensation) {
                 int duration = s->out_sample_rate * s->soft_compensation_duration;
                 int comp = av_clipf(fdelta, -s->max_soft_compensation, s->max_soft_compensation) * duration ;
                 av_log(s, AV_LOG_VERBOSE, "compensating audio timestamp drift:%f compensation:%d in:%d\n", fdelta, comp, duration);