1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 12:19:55 +00:00
openmw-tes3mp/extern/osg-ffmpeg-videoplayer
scrawl f70250a296 Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/launcher/CMakeLists.txt
	apps/opencs/CMakeLists.txt
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/CMakeLists.txt
	components/CMakeLists.txt
	extern/osg-ffmpeg-videoplayer/CMakeLists.txt
2015-06-13 21:11:24 +02:00
..
audiodecoder.cpp Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-05-23 20:33:44 +02:00
audiodecoder.hpp Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-06-03 03:18:29 +02:00
audiofactory.hpp Rename to osg-ffmpeg-videoplayer 2015-04-19 20:14:06 +02:00
CMakeLists.txt Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-06-13 21:11:24 +02:00
libavwrapper.cpp Rename to osg-ffmpeg-videoplayer 2015-04-19 20:14:06 +02:00
License.txt Rename to osg-ffmpeg-videoplayer 2015-04-19 20:14:06 +02:00
videodefs.hpp Rename to osg-ffmpeg-videoplayer 2015-04-19 20:14:06 +02:00
videoplayer.cpp Potentially missing includes 2015-06-03 23:32:49 +02:00
videoplayer.hpp Fix for travis build issue 2015-06-04 01:26:23 +02:00
videostate.cpp Potential include fix 2015-06-04 20:42:05 +02:00
videostate.hpp Potential include fix 2015-06-04 20:42:05 +02:00