Fixed build against latest ffmpeg versions

src/osgPlugins/ffmpeg/FFmpegAudioStream.hpp

@@ -2,9 +2,10 @@
 #ifndef HEADER_GUARD_OSGFFMPEG_FFMPEG_AUDIO_STREAM_H
 #define HEADER_GUARD_OSGFFMPEG_FFMPEG_AUDIO_STREAM_H
 
-#include <osg/AudioStream>
 #include "FFmpegDecoder.hpp"
 
+#include <osg/AudioStream>
+
 namespace osgFFmpeg
 {
 

src/osgPlugins/ffmpeg/FFmpegHeaders.hpp

@@ -6,6 +6,7 @@
 extern "C"
 {
 #define __STDC_CONSTANT_MACROS
+#define FF_API_OLD_SAMPLE_FMT 0
 #include <errno.h>    // for error codes defined in avformat.h
 #include <stdint.h>
 #include <avcodec.h>

src/osgPlugins/ffmpeg/FFmpegImageStream.hpp

@@ -2,13 +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 <osg/ImageStream>
 
 #include <OpenThreads/Condition>
 #include <OpenThreads/Thread>
 
-#include "FFmpegDecoder.hpp"
-#include "MessageQueue.hpp"
 
 namespace osgFFmpeg
 {

src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp

@@ -11,14 +11,12 @@
  * OpenSceneGraph Public License for more details.
 */
 
+#include "FFmpegImageStream.hpp"
+
 #include <osgDB/Registry>
 #include <osgDB/FileNameUtils>
 #include <osgDB/FileUtils>
 
-#include "FFmpegHeaders.hpp"
-#include "FFmpegImageStream.hpp"
-
-
 
 /** Implementation heavily inspired by http://www.dranger.com/ffmpeg/ */