aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRudolf Polzer <divVerent@xonotic.org>2013-11-02 11:57:25 +0100
committerAnton Khirnov <anton@khirnov.net>2013-11-02 21:16:29 +0100
commit3a14b160bd442794c6a16a6a883adb547550e847 (patch)
treee33243799e69e79eb14bc3dd7ef785e6bf09abac
parent34a0ac41a880039c7fb4b3abce10d8e2ce48fac7 (diff)
downloadffmpeg-3a14b160bd442794c6a16a6a883adb547550e847.tar.gz
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>
-rw-r--r--Changelog1
-rw-r--r--doc/filters.texi7
-rw-r--r--libavfilter/version.h2
-rw-r--r--libavfilter/vf_scale.c3
4 files changed, 9 insertions, 4 deletions
diff --git a/Changelog b/Changelog
index 540aa08dba..74ef59f756 100644
--- a/Changelog
+++ b/Changelog
@@ -46,6 +46,7 @@ version 10:
- remove avplay -vismv option, which has not worked for a long time
- Live HDS muxer
- setsar/setdar filters now support variables in ratio expressions
+- dar variable in the scale filter now returns the actual DAR (i.e. a * sar)
version 9:
diff --git a/doc/filters.texi b/doc/filters.texi
index afb48b1192..85c78b1d15 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -1856,12 +1856,15 @@ the output (cropped) width and height
@item ow, oh
same as @var{out_w} and @var{out_h}
-@item dar, a
-input display aspect ratio, same as @var{iw} / @var{ih}
+@item a
+same as @var{iw} / @var{ih}
@item sar
input sample aspect ratio
+@item dar
+input display aspect ratio, it is the same as (@var{iw} / @var{ih}) * @var{sar}
+
@item hsub, vsub
horizontal and vertical chroma subsample values. For example for the
pixel format "yuv422p" @var{hsub} is 2 and @var{vsub} is 1.
diff --git a/libavfilter/version.h b/libavfilter/version.h
index 02f348ebb7..bc079b4046 100644
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -31,7 +31,7 @@
#define LIBAVFILTER_VERSION_MAJOR 3
#define LIBAVFILTER_VERSION_MINOR 11
-#define LIBAVFILTER_VERSION_MICRO 0
+#define LIBAVFILTER_VERSION_MICRO 1
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
LIBAVFILTER_VERSION_MINOR, \
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;