Changeset b148a39 in ffmpeg

Timestamp:
Jan 14, 2014, 1:44:59 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
12bc33d7
Parents:
7766c7b7 (diff), 46bacb5 (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> (01/14/14 13:44:53)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (01/14/14 13:44:59)
Message:

Merge commit '46bacb5cc6169ff5e8e982495c4925467c1d8bb7'

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

(No files)

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