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:
61fb67d
)
vf_fps: set frame_rate.
author
Nicolas George
<nicolas.george@normalesup.org>
Tue, 3 Nov 2015 17:57:20 +0000
(09:57 -0800)
committer
Anton Khirnov
<anton@khirnov.net>
Mon, 9 Nov 2015 07:09:41 +0000
(08:09 +0100)
(cherry picked from ffmpeg commit
0d249316043fb69a3972029bff3a2969689ba8b6
)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
libavfilter/vf_fps.c
patch
|
blob
|
history
diff --git
a/libavfilter/vf_fps.c
b/libavfilter/vf_fps.c
index
ea22d37
..
e5562c8
100644
(file)
--- a/
libavfilter/vf_fps.c
+++ b/
libavfilter/vf_fps.c
@@
-116,9
+116,10
@@
static int config_props(AVFilterLink* link)
{
FPSContext *s = link->src->priv;
- link->time_base = (AVRational){ s->framerate.den, s->framerate.num };
- link->w = link->src->inputs[0]->w;
- link->h = link->src->inputs[0]->h;
+ link->time_base = (AVRational){ s->framerate.den, s->framerate.num };
+ link->frame_rate = s->framerate;
+ link->w = link->src->inputs[0]->w;
+ link->h = link->src->inputs[0]->h;
return 0;
}