mirror of https://github.com/FFmpeg/FFmpeg.git
* commit '3a14b160bd442794c6a16a6a883adb547550e847':
vf_scale: make the dar variable return the DAR.
Conflicts:
Changelog
doc/filters.texi
libavfilter/version.h
See: 61d55fda2b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/45/head
commit
7edc9240a8