Changeset bdf8318 in ffmpeg

Timestamp:
Nov 22, 2013, 11:43:45 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
8617be28
Parents:
4b3b702f (diff), c918e08b (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/22/13 11:39:48)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (11/22/13 11:43:45)
Message:

Merge commit 'c918e08b9cc9ce8d06159c51da55ec5ab018039a'

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

(No files)

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