From: Michael Niedermayer <michael@niedermayer.cc>
Date: Wed, 16 Dec 2015 17:54:55 +0000 (+0100)
Subject: avfilter/vf_decimate: Use the correct frame in difference calculation
X-Git-Tag: android-x86-7.1-r1~5968
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=58cb1fb1fe925c85161f23d5a368f126317cb292;p=android-x86%2Fexternal-ffmpeg.git

avfilter/vf_decimate: Use the correct frame in difference calculation

Fixes Ticket4964

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---

diff --git a/libavfilter/vf_decimate.c b/libavfilter/vf_decimate.c
index 4cf0771158..39c3331425 100644
--- a/libavfilter/vf_decimate.c
+++ b/libavfilter/vf_decimate.c
@@ -164,9 +164,12 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
         return 0;
     dm->got_frame[INPUT_MAIN] = dm->got_frame[INPUT_CLEANSRC] = 0;
 
+    if (dm->ppsrc)
+        in = dm->clean_src[dm->fid];
+
     if (in) {
         /* update frame metrics */
-        prv = dm->fid ? dm->queue[dm->fid - 1].frame : dm->last;
+        prv = dm->fid ? (dm->ppsrc ? dm->clean_src[dm->fid - 1] : dm->queue[dm->fid - 1].frame) : dm->last;
         if (!prv) {
             dm->queue[dm->fid].maxbdiff = INT64_MAX;
             dm->queue[dm->fid].totdiff  = INT64_MAX;