Changeset ae77f06c in ffmpeg

Timestamp:
Sep 12, 2013, 9:10:46 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
7e88dbe9
Parents:
bbcaf25d (diff), 5045f6bd (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> (09/12/13 09:09:04)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (09/12/13 09:10:46)
Message:

Merge commit '5045f6bdfabfa5d3374756d2c23f762fb042acae'

Conflicts:

configure

No change as the reference was not wrong in ffmpeg

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

(No files)

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