Changeset d15be910 in ffmpeg

Timestamp:
Oct 16, 2012, 11:27:19 AM (12 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
7ca102a7
Parents:
9270a2b3 (diff), 66a1ccd7 (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 '66a1ccd7467ab1913cd8877114c6d4c2588bb12f'

Conflicts:

configure

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

(No files)

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