Commit 7edc9240 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '3a14b160'

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

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

See: 61d55fdaMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents a75bf4e5 3a14b160
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment