[FFmpeg-cvslog] scale: set evaluated value for the "out_w" and "out_h" constants

Stefano Sabatini git at videolan.org
Sun Apr 17 17:40:46 CEST 2011


ffmpeg | branch: master | Stefano Sabatini <stefano.sabatini-lala at poste.it> | Sun Apr 17 17:23:48 2011 +0200| [c96786008172f669e546ca987e7aaa3c3469be71] | committer: Stefano Sabatini

scale: set evaluated value for the "out_w" and "out_h" constants

The constant values were never set, thus the evaluation of expressions
referencing those constants were resulting in an error.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala at poste.it>

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

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

diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c
index 1e8a194..9c3868b 100644
--- a/libavfilter/vf_scale.c
+++ b/libavfilter/vf_scale.c
@@ -165,12 +165,12 @@ static int config_props(AVFilterLink *outlink)
     av_expr_parse_and_eval(&res, (expr = scale->w_expr),
                            var_names, var_values,
                            NULL, NULL, NULL, NULL, NULL, 0, ctx);
-    scale->w = var_values[VAR_OW] = res;
+    scale->w = var_values[VAR_OUT_W] = var_values[VAR_OW] = res;
     if ((ret = av_expr_parse_and_eval(&res, (expr = scale->h_expr),
                                       var_names, var_values,
                                       NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0)
         goto fail;
-    scale->h = var_values[VAR_OH] = res;
+    scale->h = var_values[VAR_OUT_H] = var_values[VAR_OH] = res;
     /* evaluate again the width, as it may depend on the output height */
     if ((ret = av_expr_parse_and_eval(&res, (expr = scale->w_expr),
                                       var_names, var_values,



More information about the ffmpeg-cvslog mailing list