From 244e751146be63d2812e07ea80e6c793054055ce Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Sun, 12 Dec 2010 09:40:16 +0000 Subject: [PATCH] From David Fries, "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." --- src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp b/src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp index f1a329a70..173d30915 100644 --- a/src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp +++ b/src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp @@ -19,7 +19,10 @@ #include #include -#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