[FFmpeg-cvslog] swscale: #include "libavutil/mathematics.h"

Reinhard Tartler git at videolan.org
Sun Dec 25 01:36:04 CET 2011


ffmpeg | branch: release/0.6 | Reinhard Tartler <siretart at tauware.de> | Thu Dec  1 18:48:33 2011 +0100| [ca87ec53e9c7fb5d79847e8d8fc33553d2d52310] | committer: Reinhard Tartler

swscale: #include "libavutil/mathematics.h"

this file uses the M_PI macro since
4e74187db2f5db52f88729efc662df9d6bc763e1, so include the correct header
directly.

Signed-off-by: Reinhard Tartler <siretart at tauware.de>

(cherry picked from commit 5089ce1b5abe2ecbbfd7235aeb0ad47ba38305c1)

Signed-off-by: Reinhard Tartler <siretart at tauware.de>
(cherry picked from commit 851098c9e004b2ce294b687cb18633b038dcc3fe)

Conflicts:

	libswscale/utils.c

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ca87ec53e9c7fb5d79847e8d8fc33553d2d52310
---

 libswscale/utils.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/libswscale/utils.c b/libswscale/utils.c
index d7a6ea2..2629b35 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -42,6 +42,7 @@
 #include "libavutil/x86_cpu.h"
 #include "libavutil/avutil.h"
 #include "libavutil/bswap.h"
+#include "libavutil/mathematics.h"
 #include "libavutil/pixdesc.h"
 
 unsigned swscale_version(void)



More information about the ffmpeg-cvslog mailing list