Changeset ecf16f0 in ffmpeg

Timestamp:

Mar 13, 2014, 8:10:43 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

07dbdcf9

Parents:

4b50de8 (diff), 7d7be44f (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> (03/13/14 20:10:30)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/13/14 20:10:43)

Message:

Merge commit '7d7be44f3e8bc14224540a477ef0607f18964421'

• commit '7d7be44f3e8bc14224540a477ef0607f18964421': build: Drop stray PNG decoder dependency on dsputil

Conflicts:

configure

No change as the stray dependency was not in our configure

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

(No files)