Fixed handling of web cams

2013-11-06 09:49:51 +00:00
parent 6f6c44446c
commit 2ebe81cb0e
2 changed files with 8 additions and 9 deletions
--- a/src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp
+++ b/src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp
@@ -130,13 +130,14 @@ public:
        const std::string ext = osgDB::getLowerCaseFileExtension(filename);
        if (ext=="ffmpeg") return readImage(osgDB::getNameLessExtension(filename),options);

-        if (filename.compare(0, 5, "/dev/")==0)
-        {
-            return readImageStream(filename, NULL);
-        }
-
        osg::ref_ptr<osgFFmpeg::FFmpegParameters> parameters(new osgFFmpeg::FFmpegParameters);
        parseOptions(parameters.get(), options);
+
+        if (filename.compare(0, 5, "/dev/")==0)
+        {
+            return readImageStream(filename, parameters.get());
+        }
+
        if (parameters->isFormatAvailable())
        {
            return readImageStream(filename, parameters.get());