[FFmpeg-cvslog] drawtext: fix text_{w, h} expression vars

Andrey Utkin git at videolan.org
Tue Feb 7 02:02:58 CET 2012


ffmpeg | branch: master | Andrey Utkin <andrey.krieger.utkin at gmail.com> | Sun Feb  5 00:14:16 2012 +0200| [2b43dfce3651bc517c66365a30f30b708d6b79af] | committer: Anton Khirnov

drawtext: fix text_{w, h} expression vars

Before, {text_,}{w,h} vars hadn't got initialized

Signed-off-by: Anton Khirnov <anton at khirnov.net>

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

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

diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c
index c5a6ffe..f6ce124 100644
--- a/libavfilter/vf_drawtext.c
+++ b/libavfilter/vf_drawtext.c
@@ -550,7 +550,9 @@ static int dtext_prepare_text(AVFilterContext *ctx)
     y     = FFMIN(y + text_height, height - 1);
 
     dtext->w = str_w;
+    dtext->var_values[VAR_TEXT_W] = dtext->var_values[VAR_TW] = dtext->w;
     dtext->h = y;
+    dtext->var_values[VAR_TEXT_H] = dtext->var_values[VAR_TH] = dtext->h;
 
     return 0;
 }



More information about the ffmpeg-cvslog mailing list