diff options
| author | Eugene Sandulenko | 2011-01-23 19:08:09 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2011-01-23 19:08:09 +0000 |
| commit | caa6684752a310e916b179125a4125a8b3be36f0 (patch) | |
| tree | dc364d58619b297194bc5d0673b694c34fb51b6c /video/codecs/mjpeg.cpp | |
| parent | 3d15871ee2d6a9c0ce4819a6ab5925638bafa8b9 (diff) | |
| download | scummvm-rg350-caa6684752a310e916b179125a4125a8b3be36f0.tar.gz scummvm-rg350-caa6684752a310e916b179125a4125a8b3be36f0.tar.bz2 scummvm-rg350-caa6684752a310e916b179125a4125a8b3be36f0.zip | |
VIDEO: Move video classes to Video:: namespace
svn-id: r55479
Diffstat (limited to 'video/codecs/mjpeg.cpp')
| -rw-r--r-- | video/codecs/mjpeg.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/video/codecs/mjpeg.cpp b/video/codecs/mjpeg.cpp index 5f41699e10..d6ec391a84 100644 --- a/video/codecs/mjpeg.cpp +++ b/video/codecs/mjpeg.cpp @@ -28,10 +28,10 @@ #include "video/codecs/mjpeg.h" -namespace Graphics { +namespace Video { JPEGDecoder::JPEGDecoder() : Codec() { - _jpeg = new JPEG(); + _jpeg = new Graphics::JPEG(); _pixelFormat = g_system->getScreenFormat(); _surface = NULL; } @@ -45,14 +45,14 @@ JPEGDecoder::~JPEGDecoder() { } } -const Surface *JPEGDecoder::decodeImage(Common::SeekableReadStream* stream) { +const Graphics::Surface *JPEGDecoder::decodeImage(Common::SeekableReadStream* stream) { if (!_jpeg->read(stream)) { warning("Failed to decode JPEG frame"); return 0; } if (!_surface) { - _surface = new Surface(); + _surface = new Graphics::Surface(); _surface->create(_jpeg->getWidth(), _jpeg->getHeight(), _pixelFormat.bytesPerPixel); } @@ -67,4 +67,4 @@ const Surface *JPEGDecoder::decodeImage(Common::SeekableReadStream* stream) { return _surface; } -} // End of namespace Graphics +} // End of namespace Video |