Fixed clang warnings

include/osg/ValueMap

@@ -50,16 +50,18 @@ class OSG_EXPORT ValueMap : public osg::Object
         {
             typedef TemplateValueObject<T> UserValueObject;
             KeyValueMap::iterator itr = _keyValueMap.find(key);
-            if (itr!=_keyValueMap.end() && typeid(*(itr->second))==typeid(UserValueObject))
+            if (itr!=_keyValueMap.end())
             {
-                UserValueObject* uvo = static_cast<UserValueObject*>(itr->second.get());
+                osg::Object* obj = itr->second.get();
-                uvo->setValue(value);
+                if (typeid(*(obj))==typeid(UserValueObject))
-                return uvo;
+                {
-            }
+                    UserValueObject* uvo = static_cast<UserValueObject*>(itr->second.get());
-            else
+                    uvo->setValue(value);
-            {
+                    return uvo;
-                return (_keyValueMap[key] = new UserValueObject(value)).get();
+                }
             }
+
+            return (_keyValueMap[key] = new UserValueObject(value)).get();
         }
 
 

src/osg/Identifier.cpp

@@ -123,4 +123,4 @@ Identifier* osg::Identifier::get(osg::Referenced* first, osg::Referenced* second
     return get("", 0, first, second);
 }
 
-}
+}

src/osgPlugins/ffmpeg/FFmpegClocks.cpp

@@ -15,9 +15,6 @@ namespace osgFFmpeg {
 namespace
 {
 
-    const double AV_SYNC_THRESHOLD = 0.01;
-    const double AV_NOSYNC_THRESHOLD = 10.0;
-
     inline double clamp(const double value, const double min, const double max)
     {
         return (std::min)((std::max)(value, min), max);

src/osgWrappers/serializers/osg/PrimitiveSet.cpp

@@ -163,4 +163,4 @@ REGISTER_OBJECT_WRAPPER( MultiDrawArrays,
 }
 
 }
-#endif
+#endif