Changeset 0cea39fd in ffmpeg

Timestamp:
Nov 30, 2013, 2:20:11 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
f4c28aea
Parents:
79c1cdd9 (diff), b1aacd56 (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/30/13 02:20:05)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (11/30/13 02:20:11)
Message:

Merge commit 'b1aacd56685cd131f517e0551834a0bbd3f5f809'

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

(No files)

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