diff --git a/src/osgPlugins/ffmpeg/FFmpegAudioStream.hpp b/src/osgPlugins/ffmpeg/FFmpegAudioStream.hpp index 5143989fd..b48194646 100644 --- a/src/osgPlugins/ffmpeg/FFmpegAudioStream.hpp +++ b/src/osgPlugins/ffmpeg/FFmpegAudioStream.hpp @@ -2,8 +2,8 @@ #ifndef HEADER_GUARD_OSGFFMPEG_FFMPEG_AUDIO_STREAM_H #define HEADER_GUARD_OSGFFMPEG_FFMPEG_AUDIO_STREAM_H -#include #include "FFmpegDecoder.hpp" +#include namespace osgFFmpeg { diff --git a/src/osgPlugins/ffmpeg/FFmpegImageStream.hpp b/src/osgPlugins/ffmpeg/FFmpegImageStream.hpp index cd4b200e4..033a892db 100644 --- a/src/osgPlugins/ffmpeg/FFmpegImageStream.hpp +++ b/src/osgPlugins/ffmpeg/FFmpegImageStream.hpp @@ -2,14 +2,14 @@ #ifndef HEADER_GUARD_OSGFFMPEG_FFMPEG_IMAGE_STREAM_H #define HEADER_GUARD_OSGFFMPEG_FFMPEG_IMAGE_STREAM_H +#include "FFmpegDecoder.hpp" +#include "MessageQueue.hpp" + #include #include #include -#include "FFmpegDecoder.hpp" -#include "MessageQueue.hpp" - namespace osgFFmpeg { diff --git a/src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp b/src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp index ca4af165f..fb1a0ddc8 100644 --- a/src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp +++ b/src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp @@ -11,13 +11,13 @@ * OpenSceneGraph Public License for more details. */ +#include "FFmpegHeaders.hpp" +#include "FFmpegImageStream.hpp" + #include #include #include -#include "FFmpegHeaders.hpp" -#include "FFmpegImageStream.hpp" - /** Implementation heavily inspired by http://www.dranger.com/ffmpeg/ */