Mercurial > mplayer.hg

comparison libswscale/swscale.c @ 31128:100a50819c58

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove PI definition and use M_PI instead. M_PI is defined by the included file libavutil/mathematics.h.
author stefano
date Wed, 19 May 2010 22:49:04 +0000
parents 1f7d0e9e2ebf
children 661755507236
comparison
equal deleted inserted replaced
31127:aab85e35de52 31128:100a50819c58
61 #include "swscale_internal.h" 61 #include "swscale_internal.h"
62 #include "rgb2rgb.h" 62 #include "rgb2rgb.h"
63 #include "libavutil/intreadwrite.h" 63 #include "libavutil/intreadwrite.h"
64 #include "libavutil/x86_cpu.h" 64 #include "libavutil/x86_cpu.h"
65 #include "libavutil/avutil.h" 65 #include "libavutil/avutil.h"
66 #include "libavutil/mathematics.h"
66 #include "libavutil/bswap.h" 67 #include "libavutil/bswap.h"
67 #include "libavutil/pixdesc.h" 68 #include "libavutil/pixdesc.h"
68 69
69 #undef MOVNTQ 70 #undef MOVNTQ
70 #undef PAVGB 71 #undef PAVGB
74 //#undef HAVE_MMX 75 //#undef HAVE_MMX
75 //#undef ARCH_X86 76 //#undef ARCH_X86
76 #define DITHER1XBPP 77 #define DITHER1XBPP
77 78
78 #define FAST_BGR2YV12 // use 7 bit coefficients instead of 15 bit 79 #define FAST_BGR2YV12 // use 7 bit coefficients instead of 15 bit
79
80 #ifdef M_PI
81 #define PI M_PI
82 #else
83 #define PI 3.14159265358979323846
84 #endif
85 80
86 #define isPacked(x) ( \ 81 #define isPacked(x) ( \
87 (x)==PIX_FMT_PAL8 \ 82 (x)==PIX_FMT_PAL8 \
88 || (x)==PIX_FMT_YUYV422 \ 83 || (x)==PIX_FMT_YUYV422 \
89 || (x)==PIX_FMT_UYVY422 \ 84 || (x)==PIX_FMT_UYVY422 \