projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
80de930
)
vf_scale: apply the same transform to the aspect during init that is applied per...
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 26 Aug 2011 23:49:55 +0000
(
01:49
+0200)
committer
Anton Khirnov
<anton@khirnov.net>
Wed, 28 Sep 2011 06:08:30 +0000
(08:08 +0200)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
libavfilter/vf_scale.c
patch
|
blob
|
history
diff --git
a/libavfilter/vf_scale.c
b/libavfilter/vf_scale.c
index
5e7285c
..
dd2f7e1
100644
(file)
--- a/
libavfilter/vf_scale.c
+++ b/
libavfilter/vf_scale.c
@@
-218,6
+218,14
@@
static int config_props(AVFilterLink *outlink)
if (!scale->sws)
return AVERROR(EINVAL);
+
+ if (inlink->sample_aspect_ratio.num)
+ outlink->sample_aspect_ratio = av_mul_q((AVRational){outlink->h*inlink->w,
+ outlink->w*inlink->h},
+ inlink->sample_aspect_ratio);
+ else
+ outlink->sample_aspect_ratio = inlink->sample_aspect_ratio;
+
return 0;
fail: