HI Laurens, I've had a bash at merging your changes but get the following compile error:
home/robert/OpenSceneGraph/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp: In member function ‘void osgFFmpeg::FFmpegDecoderAudio::open(AVStream*)’: /home/robert/OpenSceneGraph/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp:77:14: error: ‘AV_SAMPLE_FMT_NONE’ was not declared in this scope /home/robert/OpenSceneGraph/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp:79:14: error: ‘AV_SAMPLE_FMT_U8’ was not declared in this scope /home/robert/OpenSceneGraph/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp:82:14: error: ‘AV_SAMPLE_FMT_S16’ was not declared in this scope /home/robert/OpenSceneGraph/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp:85:14: error: ‘AV_SAMPLE_FMT_S32’ was not declared in this scope /home/robert/OpenSceneGraph/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp:88:14: error: ‘AV_SAMPLE_FMT_FLT’ was not declared in this scope /home/robert/OpenSceneGraph/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp:91:14: error: ‘AV_SAMPLE_FMT_DBL’ was not declared in this scope The libavutil/avutil.h header on my Kubuntu 11.04 system has the follow settings for version: #define LIBAVUTIL_VERSION_MAJOR 50 #define LIBAVUTIL_VERSION_MINOR 15 #define LIBAVUTIL_VERSION_MICRO 1 Are these AV_ enums you've used from a different version older/newer? These enums are present in my headers. We'll need to find out which versions have them and them enclose any use of them with an #if version block. Cheers, Robert. _______________________________________________ osg-submissions mailing list [email protected] http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
