diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-12-16 18:54:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-03-13 00:38:54 +0100 |
| commit | 58cb1fb1fe925c85161f23d5a368f126317cb292 (patch) | |
| tree | daf3c0ff84ee84bd397b4b3264fcc936927672be /libavfilter | |
| parent | 52e7f6b17eed3b613ca630ba5d1d6288db891977 (diff) | |
| download | ffmpeg-58cb1fb1fe925c85161f23d5a368f126317cb292.tar.gz | |
avfilter/vf_decimate: Use the correct frame in difference calculation
Fixes Ticket4964
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/vf_decimate.c | 5 |
1 files changed, 4 insertions, 1 deletions
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; |