Changeset e948f17 in ffmpeg

Timestamp:
Feb 20, 2014, 1:44:57 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
a0cfec2e
Parents:
fdba5645 (diff), 61e7c7f2 (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> (02/20/14 13:44:40)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (02/20/14 13:44:57)
Message:

Merge commit '61e7c7f27b0a2652bf5cd282b97762ee99d025ef'

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

(No files)

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