Changeset 85d2b098 in ffmpeg

Timestamp:
Mar 6, 2014, 8:58:46 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
1618f16
Parents:
9898bd9a (diff), 84bf8817 (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.
Message:

Merge commit '84bf8817206126dab3c9abf6055b593389bcb241'

Conflicts:

configure

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

(No files)

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