Changeset ee9d53e5 in ffmpeg

Timestamp:
Nov 30, 2013, 12:28:04 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
6c9b82b6
Parents:
2d2b363c (diff), 48e13940 (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/29/13 23:58:58)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (11/30/13 00:28:04)
Message:

Merge commit '48e139409556861c9e561ce34133891d8eecc3cf'

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

(No files)

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