Changeset 11651 for OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegImageStream.hpp

Timestamp:

06/23/10 16:38:49 (3 years ago)

Author:

robert

Message:

From Magnus Kessler, "FFmpeg headers need STDC_CONSTANT_MACROS defined before stdint.h is loaded.
The file FFmpegHeaders.hpp sets this definition. However, if stdint.h is
already included through other files, it won't take any effect.

Include FFmpeg headers as early as possible in order to avoid stdint.h being
included on other paths.
"

Files:

• OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegImageStream.hpp (modified) (2 diffs)

OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegImageStream.hpp

@@ -2 +2 @@
 #ifndef HEADER_GUARD_OSGFFMPEG_FFMPEG_IMAGE_STREAM_H
 #define HEADER_GUARD_OSGFFMPEG_FFMPEG_IMAGE_STREAM_H
+
+#include "FFmpegDecoder.hpp"
+#include "MessageQueue.hpp"
 
 #include <osg/ImageStream>
@@ -7 +10 @@
 #include <OpenThreads/Condition>
 #include <OpenThreads/Thread>
-
-#include "FFmpegDecoder.hpp"
-#include "MessageQueue.hpp"
 
 namespace osgFFmpeg