teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Dead code removal

Browse source
This commit is contained in:
scrawl 2015-04-19 20:12:37 +02:00
parent 42f6d9e15b
commit 168c0d9b39
2 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extern/ogre-ffmpeg-videoplayer/videoplayer.hpp vendored
View file

@ -22,7 +22,7 @@ namespace Video
class MovieAudioFactory; class MovieAudioFactory;
/** /**
* @brief Plays a video on an Ogre texture. * @brief Plays a video on an osg texture.
*/ */
class VideoPlayer class VideoPlayer
{ {

11
extern/ogre-ffmpeg-videoplayer/videostate.cpp vendored
View file

@ -5,12 +5,6 @@
#endif #endif
#include <stdint.h> #include <stdint.h>
// Has to be included *before* ffmpeg, due to a macro collision with ffmpeg (#define PixelFormat in avformat.h - grumble)
#include <OgreTextureManager.h>
#include <OgreHardwarePixelBuffer.h>
#include <OgreResourceGroupManager.h>
#include <OgreStringConverter.h>
#include <osg/Texture2D> #include <osg/Texture2D>
extern "C" extern "C"
@ -535,12 +529,9 @@ void VideoState::decode_thread_loop(VideoState *self)
av_free_packet(packet); av_free_packet(packet);
} }
} }
catch(std::runtime_error& e) { catch(std::exception& e) {
std::cerr << "An error occured playing the video: " << e.what () << std::endl; std::cerr << "An error occured playing the video: " << e.what () << std::endl;
} }
catch(Ogre::Exception& e) {
std::cerr << "An error occured playing the video: " << e.getFullDescription () << std::endl;
}
self->mQuit = true; self->mQuit = true;
} }