Changeset bc82405 in ffmpeg

Timestamp:

Jul 12, 2013, 12:51:24 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

86d1a5d8

Parents:

cce25437 (diff), 52ea2986 (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> (07/12/13 12:49:55)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (07/12/13 12:51:24)

Message:

Merge commit '52ea29867070243385220a223d7512ea7d4ae2d2'

• commit '52ea29867070243385220a223d7512ea7d4ae2d2': fate: use current syntax for the scale filter

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)