Changeset 30d3f976 in ffmpeg

Timestamp:
Nov 18, 2014, 7:33:37 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
6da12d46
Parents:
ea79dfba (diff), 7813e675 (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 '7813e6752bdab38a5686c301e869ee71d97bce69'

Conflicts:

configure

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

(No files)

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