Merge commit '34a0ac41a880039c7fb4b3abce10d8e2ce48fac7'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Nov 2013 10:36:16 +0000 (11:36 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Nov 2013 10:54:19 +0000 (11:54 +0100)
commita75bf4e5c186a1f8a1fc63edb0bc0b3fe7180d5b
tree7138bf498875f924a2019739e2c05a8a7249765a
parent8a701ef7ddbb2d80ef77b14287d286fc9760f131
parent34a0ac41a880039c7fb4b3abce10d8e2ce48fac7
Merge commit '34a0ac41a880039c7fb4b3abce10d8e2ce48fac7'

* commit '34a0ac41a880039c7fb4b3abce10d8e2ce48fac7':
  vf_aspect: support variables in evaluating the aspect ratios

Conflicts:
Changelog
doc/filters.texi
libavfilter/vf_aspect.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
doc/filters.texi
libavfilter/vf_aspect.c