[FFmpeg-soc] [soc]: r5824 - libavfilter/vf_overlay.c
bcoudurier
subversion at mplayerhq.hu
Sun Jun 6 00:32:52 CEST 2010
Author: bcoudurier
Date: Sun Jun 6 00:32:52 2010
New Revision: 5824
Log:
fix x and y parameters after eval
Modified:
libavfilter/vf_overlay.c
Modified: libavfilter/vf_overlay.c
==============================================================================
--- libavfilter/vf_overlay.c Sat Jun 5 15:41:36 2010 (r5823)
+++ libavfilter/vf_overlay.c Sun Jun 6 00:32:52 2010 (r5824)
@@ -145,13 +145,13 @@ static int config_input_overlay(AVFilter
NULL, NULL, NULL, NULL,
NULL, 0, ctx)) < 0)
goto fail;
- over->x = ret;
+ over->x = res;
if ((ret = av_parse_and_eval_expr(&res, (expr = over->y_expr),
var_names, var_values,
NULL, NULL, NULL, NULL,
NULL, 0, ctx)) < 0)
goto fail;
- over->y = ret;
+ over->y = res;
over->x &= ~((1 << over->hsub) - 1);
over->y &= ~((1 << over->vsub) - 1);
More information about the FFmpeg-soc
mailing list