diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-14 15:11:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-14 15:11:34 +0200 |
| commit | d6f6a7557c8d25bb9943b4d3390550a9cffb918b (patch) | |
| tree | d3f96d36dc86276ae0018c4294d416c972f3ea28 /compat | |
| parent | de3b1116dab12843b833e828bb219fb5673b0092 (diff) | |
| parent | 7638f0b2fef0481e55985ab8530e8ad9c16f113a (diff) | |
| download | ffmpeg-d6f6a7557c8d25bb9943b4d3390550a9cffb918b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avutil: Do not make ff_ symbols globally visible.
avutil: Rename ff_set_systematic_pal2() ---> avpriv_set_systematic_pal2()
build: tms470: work around glibc math.h problems
configure: improve tms470 compiler usage with glibc
Conflicts:
libavcodec/bmpenc.c
libavcodec/rawdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/tms470/math.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/compat/tms470/math.h b/compat/tms470/math.h new file mode 100644 index 0000000000..1104d744e7 --- /dev/null +++ b/compat/tms470/math.h @@ -0,0 +1,7 @@ +#include_next <math.h> + +#undef INFINITY +#undef NAN + +#define INFINITY (*(const float*)((const unsigned []){ 0x7f800000 })) +#define NAN (*(const float*)((const unsigned []){ 0x7fc00000 })) |