Changeset 11ba0c8 in ffmpeg

Timestamp:
Jun 26, 2014, 12:58:59 AM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
7e8fdf05
Parents:
3eae34d5 (diff), 5ab03e41 (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> (06/26/14 00:58:31)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (06/26/14 00:58:59)
Message:

Merge commit '5ab03e41e553452118113d0c224fa32b325e45e5'

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

(No files)

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