Changeset a486dec4 in ffmpeg

Timestamp:

Nov 21, 2013, 5:49:41 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

c8a0a2e

Parents:

bc140fb5 (diff), 874838dc (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/21/13 17:48:48)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/21/13 17:49:41)

Message:

Merge commit '874838dc6589d978611c89a40694a5074f892a76'

• commit '874838dc6589d978611c89a40694a5074f892a76': fate: add one select filter test

Conflicts:

tests/fate/filter-video.mak

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

(No files)