Changeset 671f908 in ffmpeg

Timestamp:
Apr 11, 2014, 5:34:03 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
fb7d64df
Parents:
c04961fa (diff), f20892eb (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> (04/11/14 17:24:40)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (04/11/14 17:34:03)
Message:

Merge commit 'f20892eb67a7b4b5a3c080388a35a3380516a805'

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

(No files)

Note: See TracChangeset for help on using the changeset viewer.