Thanks David, changes merged and submitted to svn/trunk, Cheers, Robert.
On Sat, Dec 11, 2010 at 1:56 AM, David Fries <[email protected]> wrote: > The ffmpeg lockmanager was introduced in ffmpeg 52 30 1, but > later backported to 52 20 1, so add that to the version check > in ReaderWriterFFmpeg.cpp. > > diff --git a/src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp > b/src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp > index f1a329a..f2e0acb 100644 > --- a/src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp > +++ b/src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp > @@ -19,12 +19,14 @@ > #include <osgDB/FileNameUtils> > #include <osgDB/FileUtils> > > -#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR==52 && > LIBAVCODEC_VERSION_MINOR>=30) > + > +#if LIBAVCODEC_VERSION_MAJOR >= 53 || \ > + (LIBAVCODEC_VERSION_MAJOR==52 && LIBAVCODEC_VERSION_MINOR>=30) || \ > + (LIBAVCODEC_VERSION_MAJOR==52 && LIBAVCODEC_VERSION_MINOR==20 && > LIBAVCODEC_VERSION_MICRO >= 1) > #define USE_AV_LOCK_MANAGER > #endif > > > - > /** Implementation heavily inspired by http://www.dranger.com/ffmpeg/ */ > > class ReaderWriterFFmpeg : public osgDB::ReaderWriter > -- > 1.7.1 > > _______________________________________________ > 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
