diff options
| author | D G Turner | 2012-10-12 17:03:32 +0100 |
|---|---|---|
| committer | D G Turner | 2012-10-12 17:03:32 +0100 |
| commit | 151b7beb47ec4b964862d6779bd48e3a33482bbd (patch) | |
| tree | 867717c5266d0908d95edd82560599be20a4ede9 /base/main.cpp | |
| parent | 80af0e239473f85c49cc2da3c848dfcde41d4a37 (diff) | |
| parent | 2b55837650c4229dc3d75b660cecfc7a3292e5e0 (diff) | |
| download | scummvm-rg350-151b7beb47ec4b964862d6779bd48e3a33482bbd.tar.gz scummvm-rg350-151b7beb47ec4b964862d6779bd48e3a33482bbd.tar.bz2 scummvm-rg350-151b7beb47ec4b964862d6779bd48e3a33482bbd.zip | |
Merge branch 'master' into teenagentRefactor
Conflicts:
engines/teenagent/callbacks.cpp
Diffstat (limited to 'base/main.cpp')
| -rw-r--r-- | base/main.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/base/main.cpp b/base/main.cpp index 25e1b881cc..355a65f883 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -57,6 +57,7 @@ #include "graphics/cursorman.h" #include "graphics/fontman.h" +#include "graphics/yuv_to_rgb.h" #ifdef USE_FREETYPE2 #include "graphics/fonts/ttf.h" #endif @@ -511,6 +512,8 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) { #ifdef USE_FREETYPE2 Graphics::shutdownTTF(); #endif + EngineManager::destroy(); + Graphics::YUVToRGBManager::destroy(); return 0; } |