Changeset d1687290 in ffmpeg

Timestamp:

Mar 6, 2014, 2:18:14 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

99b4da73

Parents:

2d99de66 (diff), 713d3f98 (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> (03/06/14 13:59:58)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/06/14 14:18:14)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: vf_shuffleplanes: fix the type of the mapping indices

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

(No files)