Changeset 5eb353e0 in ffmpeg

Timestamp:

Jul 1, 2012, 8:43:09 PM (12 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

d35a986

Parents:

23eeffcd (diff), 3893feec (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/01/12 20:12:38)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (07/01/12 20:43:09)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: opt/eval: Include mathematics.h for NAN/INFINITY mathematics: Don't use division by zero in NAN/INFINITY macros wma: Lower the maximum number of channels to 2 x86: cpu: clean up check for cpuid instruction support ARM: generate position independent code to access data symbols

Conflicts:

libavutil/opt.c

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

(No files)