diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2003-01-08 13:18:42 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2003-01-08 13:18:42 +0000 |
| commit | 6f1c8d4eafabd914b87e9171bf4d04f4ef9160ea (patch) | |
| tree | e70be493d1222b10f96aa5efac01c0ec0d5bcc97 /src/libffmpeg/libavcodec/common.h | |
| parent | 1fb58a63872660424777d41389e426dc90f1b660 (diff) | |
| download | xine-lib-6f1c8d4eafabd914b87e9171bf4d04f4ef9160ea.tar.gz xine-lib-6f1c8d4eafabd914b87e9171bf4d04f4ef9160ea.tar.bz2 | |
syncing ffmpeg (with some compilation fixes)
- fixes wma bugs
- mace, huffyuv and mp3 decoders imported (but not enabled)
tested: wma (v1 and v2), mpeg4, msmpeg4 v1, v2 and v3, divx3, divx4, divx5, xvid and
dv decoders. everything looks fine.
CVS patchset: 3828
CVS date: 2003/01/08 13:18:42
Diffstat (limited to 'src/libffmpeg/libavcodec/common.h')
| -rw-r--r-- | src/libffmpeg/libavcodec/common.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/libffmpeg/libavcodec/common.h b/src/libffmpeg/libavcodec/common.h index 9dfd7dcda..405ddaa09 100644 --- a/src/libffmpeg/libavcodec/common.h +++ b/src/libffmpeg/libavcodec/common.h @@ -33,6 +33,10 @@ # define ENODATA 61 # endif +#ifndef M_PI +#define M_PI 3.14159265358979323846 +#endif + #endif /* HAVE_AV_CONFIG_H */ /* Suppress restrict if it was not defined in config.h. */ @@ -79,9 +83,6 @@ typedef INT64 int64_t; # define UINT64_C(c) (c ## ULL) # endif /* __MINGW32__ */ -# define M_PI 3.14159265358979323846 -# define M_SQRT2 1.41421356237309504880 /* sqrt(2) */ - # ifdef _DEBUG # define DEBUG # endif |