Changeset 58b8d268 in ffmpeg

Timestamp:
Mar 12, 2014, 8:45:02 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
e5920425
Parents:
990f956c (diff), aa807425 (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 'aa807425395caa17a85ed2833133278e8bd44a76'

Conflicts:

configure

Not merged as the problematic pkg config code wasnt merged

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

(No files)

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