diff options
| author | Rudolf Polzer <divVerent@xonotic.org> | 2013-11-02 11:57:25 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-11-02 21:16:29 +0100 |
| commit | 3a14b160bd442794c6a16a6a883adb547550e847 (patch) | |
| tree | e33243799e69e79eb14bc3dd7ef785e6bf09abac /libavfilter/vf_scale.c | |
| parent | 34a0ac41a880039c7fb4b3abce10d8e2ce48fac7 (diff) | |
vf_scale: make the dar variable return the DAR.
Before, it just returned width/height. Correct is width/height*sar.
That way it is consistent with DAR as in probe output and setdar.
Signed-off-by: Rudolf Polzer <divverent@xonotic.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavfilter/vf_scale.c')
| -rw-r--r-- | libavfilter/vf_scale.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 096397f8aa..c47c6f3bc9 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -163,9 +163,10 @@ static int config_props(AVFilterLink *outlink) var_values[VAR_IN_H] = var_values[VAR_IH] = inlink->h; var_values[VAR_OUT_W] = var_values[VAR_OW] = NAN; var_values[VAR_OUT_H] = var_values[VAR_OH] = NAN; - var_values[VAR_DAR] = var_values[VAR_A] = (double) inlink->w / inlink->h; + var_values[VAR_A] = (double) inlink->w / inlink->h; var_values[VAR_SAR] = inlink->sample_aspect_ratio.num ? (double) inlink->sample_aspect_ratio.num / inlink->sample_aspect_ratio.den : 1; + var_values[VAR_DAR] = var_values[VAR_A] * var_values[VAR_SAR]; var_values[VAR_HSUB] = 1 << desc->log2_chroma_w; var_values[VAR_VSUB] = 1 << desc->log2_chroma_h; |