aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-12-04 15:29:26 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-12-04 15:29:26 +0100
commitdda3d716d63f5f13d5f6bf69fad6abd50928abc5 (patch)
tree19758dd192e95bc62cf12625d5a78da084e857a8 /libavfilter
parent594090c6c20a796ddfb04d54e2df98dca3fc653a (diff)
downloadffmpeg-dda3d716d63f5f13d5f6bf69fad6abd50928abc5.tar.gz
vf_drawtext: support W/H parameters to reduce UI differences to qatar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
-rw-r--r--libavfilter/vf_drawtext.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c
index c9dde65e32..900c803d5f 100644
--- a/libavfilter/vf_drawtext.c
+++ b/libavfilter/vf_drawtext.c
@@ -47,8 +47,8 @@
#include FT_GLYPH_H
static const char * const var_names[] = {
- "main_w", "w", ///< width of the input video
- "main_h", "h", ///< height of the input video
+ "main_w", "w", "W", ///< width of the input video
+ "main_h", "h", "H", ///< height of the input video
"tw", "text_w", ///< width of the rendered text
"th", "text_h", ///< height of the rendered text
"max_glyph_w", ///< max glyph width
@@ -68,8 +68,8 @@ static const char * const var_names[] = {
};
enum var_name {
- VAR_MAIN_W, VAR_W,
- VAR_MAIN_H, VAR_H,
+ VAR_MAIN_W, VAR_w, VAR_W,
+ VAR_MAIN_H, VAR_h, VAR_H,
VAR_TW, VAR_TEXT_W,
VAR_TH, VAR_TEXT_H,
VAR_MAX_GLYPH_W,
@@ -458,8 +458,8 @@ static int config_input(AVFilterLink *inlink)
dtext->shadowcolor[3] = rgba[3];
}
- dtext->var_values[VAR_W] = dtext->var_values[VAR_MAIN_W] = inlink->w;
- dtext->var_values[VAR_H] = dtext->var_values[VAR_MAIN_H] = inlink->h;
+ dtext->var_values[VAR_w] = dtext->var_values[VAR_W] = dtext->var_values[VAR_MAIN_W] = inlink->w;
+ dtext->var_values[VAR_h] = dtext->var_values[VAR_H] = dtext->var_values[VAR_MAIN_H] = inlink->h;
dtext->var_values[VAR_SAR] = inlink->sample_aspect_ratio.num ? av_q2d(inlink->sample_aspect_ratio) : 1;
dtext->var_values[VAR_DAR] = (double)inlink->w / inlink->h * dtext->var_values[VAR_SAR];
dtext->var_values[VAR_HSUB] = 1<<pix_desc->log2_chroma_w;