Merge commit '3a14b160bd442794c6a16a6a883adb547550e847'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Nov 2013 11:23:01 +0000 (12:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Nov 2013 11:31:21 +0000 (12:31 +0100)
commit7edc9240a8f424fdcb30efeed127ffca8145774a
tree7138bf498875f924a2019739e2c05a8a7249765a
parenta75bf4e5c186a1f8a1fc63edb0bc0b3fe7180d5b
parent3a14b160bd442794c6a16a6a883adb547550e847
Merge commit '3a14b160bd442794c6a16a6a883adb547550e847'

* commit '3a14b160bd442794c6a16a6a883adb547550e847':
  vf_scale: make the dar variable return the DAR.

Conflicts:
Changelog
doc/filters.texi
libavfilter/version.h

See: 61d55fda2b513caf18e37b27aba680a87840904a
Merged-by: Michael Niedermayer <michaelni@gmx.at>