Changeset 9c6eef6f in ffmpeg

Timestamp:
Apr 28, 2014, 11:04:44 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
c6eee312
Parents:
0f630b7b (diff), b2b4afe8 (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/28/14 23:02:58)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (04/28/14 23:04:44)
Message:

Merge commit 'b2b4afe8115fe3c8b005d663610e5af06f110165'

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

(No files)

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