Hi Laurens, This fixes the build just fine, both sets of changes to ffmpeg now merged and checked into svn/trunk.
In testing on my Kunbtunu 11.04 system I've found that osgmovie -e ffmpeg --audio mymovide.ogg crashes with a range of errors, an occasionally runs correctly. If I run osgmovie in gdb it always works fine, and the errors I get look to be related to the audio backend. This problem existed prior to your changes so don't worry about this being a regression due to your changes, I believe the regression is something down to ffmpeg or the audio backend on my rev of Kubuntu. Do you see any stability issues? Robert. On Wed, Sep 14, 2011 at 10:13 AM, Laurens Voerman <[email protected]> wrote: > Hi Robert, > I can find the change, avutil version 50.38.0 introduced a new header file: > libavutil/samplefmt.h > older versions use > libavcodec/avcodec.h > with the sampleformats without AV_ > > an intermideate fix with the FF_API_OLD_SAMPLE_FMT is removed from ffmpeg > 0.8.3 so > I think this is the correct fix: > > #if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(50,38,0) > #define AV_SAMPLE_FMT_NONE SAMPLE_FMT_NONE > #define AV_SAMPLE_FMT_U8 SAMPLE_FMT_U8 > #define AV_SAMPLE_FMT_S16 SAMPLE_FMT_S16 > #define AV_SAMPLE_FMT_S32 SAMPLE_FMT_S32 > #define AV_SAMPLE_FMT_FLT SAMPLE_FMT_FLT > #define AV_SAMPLE_FMT_DBL SAMPLE_FMT_DBL > #define AV_SAMPLE_FMT_NB SAMPLE_FMT_NB > #endif > > Attached as zip is a modified > OpenSceneGraph/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp > I think that is the place to fix the problem. > > Thanks, > Laurens. > > > On 9/13/2011 4:09 PM, Robert Osfield wrote: >> >> 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 > > _______________________________________________ > osg-submissions mailing list > [email protected] > http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org > > _______________________________________________ osg-submissions mailing list [email protected] http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
