Changeset 11146a9b in ffmpeg

Timestamp:

Mar 1, 2014, 11:27:59 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

80793afb

Parents:

ad48c937 (diff), 34150be5 (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 '34150be515cd9c43b0b679806b8d01774960af78'

• commit '34150be515cd9c43b0b679806b8d01774960af78': build: Let the iac decoder depend on the imc decoder

Conflicts:

configure

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

(No files)