From 36b3907d79ece75847eb5980bd31e59eef6d075c Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 24 Mar 2009 23:25:30 +0000 Subject: [PATCH] Added support for adding .ffmpeg to filenames to force selection of ffmpeg plugin --- 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 ee9d93795..36f0e1381 100644 --- a/src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp +++ b/src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp @@ -30,6 +30,7 @@ public: { supportsProtocol("http","Read video/audio from http using ffmpeg."); + supportsExtension("ffmpeg", ""); supportsExtension("avi", ""); supportsExtension("flv", ""); supportsExtension("mov", ""); @@ -55,12 +56,14 @@ public: virtual ReadResult readImage(const std::string & filename, const osgDB::ReaderWriter::Options * options) const { + 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, options); } - const std::string ext = osgDB::getLowerCaseFileExtension(filename); if (! acceptsExtension(ext)) return ReadResult::FILE_NOT_HANDLED;