[FFmpeg-cvslog] vf_scale: apply the same transform to the aspect during init that is applied per frame

[Michael Niedermayer]

ffmpeg | branch: release/0.7 | Michael Niedermayer <michaelni at gmx.at> | Sat Aug 27 01:49:55 2011 +0200| [8af11e51f22705f37818f0aaded8bbd24dd34aac] | committer: Michael Niedermayer

vf_scale: apply the same transform to the aspect during init that is applied per frame

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit c8868f28e357e7e6ffe3254d0056b3e8033fe8e5)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8af11e51f22705f37818f0aaded8bbd24dd34aac
---

 libavfilter/vf_scale.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c
index e172a2e..ba8f9e1 100644
--- a/libavfilter/vf_scale.c
+++ b/libavfilter/vf_scale.c
@@ -232,6 +232,11 @@ 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: