Changeset 1abb0319 in ffmpeg

Timestamp:

Mar 23, 2014, 2:32:00 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

acb8d65

Parents:

802e5fc8 (diff), 0f0d1d05 (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 '0f0d1d056e1a3ad3db32b7d1a06286b2841e91b1'

• commit '0f0d1d056e1a3ad3db32b7d1a06286b2841e91b1': configure: Always use -DOPJ_STATIC when checking for openjpeg

Conflicts:

configure

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

(No files)