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

Michael Niedermayer git at videolan.org
Mon Mar 19 05:30:20 CET 2012


ffmpeg | branch: release/0.8 | Michael Niedermayer <michaelni at gmx.at> | Sat Aug 27 01:49:55 2011 +0200| [7f62cf120bd066964d93617c73bd5f9f2ee9de00] | committer: Reinhard Tartler

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

Signed-off-by: Anton Khirnov <anton at khirnov.net>
(cherry picked from commit d33e0c6bc819048b05c168d304fba7bdd75a80e1)

Signed-off-by: Anton Khirnov <anton at khirnov.net>
Signed-off-by: Reinhard Tartler <siretart at tauware.de>

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

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

diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c
index 5288d32..bbc8321 100644
--- a/libavfilter/vf_scale.c
+++ b/libavfilter/vf_scale.c
@@ -213,6 +213,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:



More information about the ffmpeg-cvslog mailing list