Changeset 7431923d in ffmpeg

Timestamp:

Dec 14, 2013, 10:23:57 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

f5013913

Parents:

acda7c8e (diff), 7cbe1ea9 (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 '7cbe1ea9df83ec66403fbf6400353bcb2242bf06'

• commit '7cbe1ea9df83ec66403fbf6400353bcb2242bf06': configure: Move the bz2 and zlib checks below phtreads

Conflicts:

configure

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

(No files)