Changeset b00f6bb9 in ffmpeg

Timestamp:
Apr 4, 2014, 9:24:21 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
51fd962c
Parents:
849a8c4c (diff), b97f2c7c (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/04/14 21:23:30)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (04/04/14 21:24:21)
Message:

Merge commit 'b97f2c7c49e35724f3963677f8aeee28089dc64e'

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

(No files)

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