Changeset a062bee1 in ffmpeg

Timestamp:
Feb 14, 2014, 1:18:04 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
c0c6f9ab
Parents:
1d91af5a (diff), 066ad249 (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/14/14 13:17:35)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (02/14/14 13:18:04)
Message:

Merge commit '066ad249843bde656265b59110c2521e2b1ce131'

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

(No files)

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