FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #861 from aluaces/default-ffmpeg

Browse Source 
Set ffmpeg as the default plugin for video files.
This commit is contained in:
OpenSceneGraph git repository
2019-12-12 13:09:33 +00:00
committed by GitHub
parent c0ea4c6310 8f6eff9de5
commit 445596e59c
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osgDB/CMakeLists.txt
View File

@@ -147,8 +147,8 @@ IF(AV_FOUNDATION_FOUND)
ADD_DEFINITIONS(-DUSE_AV_FOUNDATION)
ENDIF()
IF(XINE_FOUND)
ADD_DEFINITIONS(-DUSE_XINE)
IF(FFMPEG_FOUND)
ADD_DEFINITIONS(-DUSE_FFMPEG)
ENDIF()
IF(INVENTOR_FOUND)

18
src/osgDB/Registry.cpp
View File

@@ -380,16 +380,16 @@ Registry::Registry()
addFileExtensionAlias("tif", "tiff");
// really need to decide this at runtime...
#if defined(USE_XINE)
#if defined(USE_FFMPEG)
addFileExtensionAlias("mov", "xine");
addFileExtensionAlias("mpg", "xine");
addFileExtensionAlias("ogv", "xine");
addFileExtensionAlias("mpv", "xine");
addFileExtensionAlias("dv", "xine");
addFileExtensionAlias("avi", "xine");
addFileExtensionAlias("wmv", "xine");
addFileExtensionAlias("flv", "xine");
addFileExtensionAlias("mov", "ffmpeg");
addFileExtensionAlias("mpg", "ffmpeg");
addFileExtensionAlias("ogv", "ffmpeg");
addFileExtensionAlias("mpv", "ffmpeg");
addFileExtensionAlias("dv", "ffmpeg");
addFileExtensionAlias("avi", "ffmpeg");
addFileExtensionAlias("wmv", "ffmpeg");
addFileExtensionAlias("flv", "ffmpeg");
#endif
// support QuickTime for Windows