Changeset 07dbdcf9 in ffmpeg

Timestamp:

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

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

2631d155

Parents:

ecf16f0 (diff), 9ecf1b62 (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:16:02)

git-committer:

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

Message:

Merge commit '9ecf1b62f37ef9cbdf2d7300a052cd704c4ba731'

• commit '9ecf1b62f37ef9cbdf2d7300a052cd704c4ba731': build: Drop stray MLP decoder dependency on dsputil

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

(No files)