Changeset 1f17619f in ffmpeg

Timestamp:
Oct 8, 2013, 9:23:00 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
3f965ab
Parents:
17d9c7c2 (diff), bbe4a6db (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> (10/08/13 09:22:54)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (10/08/13 09:23:00)
Message:

Merge commit 'bbe4a6db44f0b55b424a5cc9d3e89cd88e250450'

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

(No files)

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