Changeset 7011aab5 in ffmpeg

Timestamp:

Mar 6, 2014, 12:09:06 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

2d99de66

Parents:

2fb0027c (diff), e1f2987b (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.

Message:

Merge commit 'e1f2987b10112489f6da5501d4c8735a798c9e3f'

• commit 'e1f2987b10112489f6da5501d4c8735a798c9e3f': FATE: add tests for the shuffleplanes filter

Conflicts:

tests/fate/filter-video.mak

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

(No files)