Changeset 60fdf7dd in ffmpeg

Timestamp:
Apr 21, 2014, 9:54:09 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
5e5aced5
Parents:
e0cdc68b (diff), 6f243b17 (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> (04/21/14 21:53:21)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (04/21/14 21:54:09)
Message:

Merge commit '6f243b17c537646b894857d43dfdac65f85ab377'

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

(No files)

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