Changeset 935d0ee0 in ffmpeg

Timestamp:
Nov 1, 2013, 6:12:13 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
382545ae
Parents:
7592d30b (diff), eb5920c1 (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/01/13 18:11:52)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (11/01/13 18:12:13)
Message:

Merge commit 'eb5920c195d1b0bda81782af4ba0c5982f5225b3'

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

(No files)

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