Changeset 17d9c7c2 in ffmpeg

Timestamp:
Oct 8, 2013, 9:15:17 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
1f17619f
Parents:
3352fdb2 (diff), 3fb78e99 (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:15:11)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (10/08/13 09:15:17)
Message:

Merge commit '3fb78e99a04d0ed8db834d813d933eb86c37142a'

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

(No files)

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