Changeset efb5ebe8 in ffmpeg

Timestamp:
Dec 11, 2013, 10:55:51 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
3b2b0739
Parents:
5a15bd6f (diff), b06c8bce (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> (12/11/13 22:55:47)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (12/11/13 22:55:51)
Message:

Merge commit 'b06c8bce02b15115a4789252365df2dda0c4713c'

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

(No files)

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