OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
52e7f6b
)
avfilter/vf_decimate: Use the correct frame in difference calculation
author
Michael Niedermayer
<michael@niedermayer.cc>
Wed, 16 Dec 2015 17:54:55 +0000
(18:54 +0100)
committer
Michael Niedermayer
<michael@niedermayer.cc>
Sat, 12 Mar 2016 23:38:54 +0000
(
00:38
+0100)
Fixes Ticket4964
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavfilter/vf_decimate.c
patch
|
blob
|
history
diff --git
a/libavfilter/vf_decimate.c
b/libavfilter/vf_decimate.c
index
4cf0771
..
39c3331
100644
(file)
--- 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;