Changeset a75bf4e5 in ffmpeg

Timestamp:

Nov 3, 2013, 10:54:19 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

7edc9240

Parents:

8a701ef7 (diff), 34a0ac41 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (11/03/13 10:36:16)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/03/13 10:54:19)

Message:

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>

(No files)