Changeset 47ca9f04 in ffmpeg

Timestamp:

Jul 5, 2013, 11:11:06 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

c6c22312

Parents:

8fdec02f (diff), d3635f3a (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> (07/05/13 10:50:02)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (07/05/13 11:11:06)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: compat: wrap math.h to avoid AIX-specific clashes

Conflicts:

configure

See: bf18abb2eb79c00c69f6f83ede64536e3297793c, 0915b531bc62440914710d2989813563b0446c5e

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

(No files)