From d2e29efcd9b95f2990d5e72922d05731be4613af Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 2 Sep 2008 16:13:54 +0000 Subject: [PATCH] Added acceptance of .ogv extensions in xine-lib plugin --- src/osgDB/Registry.cpp | 1 + src/osgPlugins/xine/ReaderWriterXine.cpp | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/osgDB/Registry.cpp b/src/osgDB/Registry.cpp index b3ead7053..56a6dc23b 100644 --- a/src/osgDB/Registry.cpp +++ b/src/osgDB/Registry.cpp @@ -243,6 +243,7 @@ Registry::Registry() #if defined(USE_XINE) addFileExtensionAlias("mov", "xine"); addFileExtensionAlias("mpg", "xine"); + addFileExtensionAlias("ogv", "xine"); addFileExtensionAlias("mpv", "xine"); addFileExtensionAlias("dv", "xine"); addFileExtensionAlias("avi", "xine"); diff --git a/src/osgPlugins/xine/ReaderWriterXine.cpp b/src/osgPlugins/xine/ReaderWriterXine.cpp index 5022cce55..39680e243 100644 --- a/src/osgPlugins/xine/ReaderWriterXine.cpp +++ b/src/osgPlugins/xine/ReaderWriterXine.cpp @@ -313,6 +313,7 @@ class ReaderWriterXine : public osgDB::ReaderWriter { supportsExtension("avi",""); supportsExtension("db",""); + supportsExtension("ogv",""); supportsExtension("flv",""); supportsExtension("mov",""); supportsExtension("mpg","Mpeg movie format"); @@ -353,8 +354,8 @@ class ReaderWriterXine : public osgDB::ReaderWriter std::string fileName; if (ext=="xine") { - fileName = osgDB::getNameLessExtension(file); - osg::notify(osg::NOTICE)<<"Xine stipped filename = "<