From: Anton Khirnov <anton@khirnov.net>
Date: Tue, 22 May 2012 18:44:07 +0000 (+0200)
Subject: asyncts: reset delta to 0 when it's not used.
X-Git-Tag: android-x86-4.4-r1~8529^2~1853
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f297dd3812510fc83080e265dc4534a3898005b0;p=android-x86%2Fexternal-ffmpeg.git

asyncts: reset delta to 0 when it's not used.

Fixes an invalid write.
---

diff --git a/libavfilter/af_asyncts.c b/libavfilter/af_asyncts.c
index 5cde0bf00a..adb5347a80 100644
--- a/libavfilter/af_asyncts.c
+++ b/libavfilter/af_asyncts.c
@@ -182,10 +182,13 @@ static void filter_samples(AVFilterLink *inlink, AVFilterBufferRef *buf)
     if (labs(delta) > s->min_delta) {
         av_log(ctx, AV_LOG_VERBOSE, "Discontinuity - %"PRId64" samples.\n", delta);
         out_size += delta;
-    } else if (s->resample) {
-        int comp = av_clip(delta, -s->max_comp, s->max_comp);
-        av_log(ctx, AV_LOG_VERBOSE, "Compensating %d samples per second.\n", comp);
-        avresample_set_compensation(s->avr, delta, inlink->sample_rate);
+    } else {
+        if (s->resample) {
+            int comp = av_clip(delta, -s->max_comp, s->max_comp);
+            av_log(ctx, AV_LOG_VERBOSE, "Compensating %d samples per second.\n", comp);
+            avresample_set_compensation(s->avr, delta, inlink->sample_rate);
+        }
+        delta = 0;
     }
 
     if (out_size > 0) {