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/cinepak.h | |
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/cinepak.h')
-rw-r--r-- | video/codecs/cinepak.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/video/codecs/cinepak.h b/video/codecs/cinepak.h index c200c75e8c..8b4c0216a3 100644 --- a/video/codecs/cinepak.h +++ b/video/codecs/cinepak.h @@ -34,7 +34,7 @@ #include "video/codecs/codec.h" -namespace Graphics { +namespace Video { struct CinepakCodebook { byte y[4]; @@ -56,7 +56,7 @@ struct CinepakFrame { uint16 stripCount; CinepakStrip *strips; - Surface *surface; + Graphics::Surface *surface; }; class CinepakDecoder : public Codec { @@ -64,18 +64,18 @@ public: CinepakDecoder(int bitsPerPixel = 24); ~CinepakDecoder(); - const Surface *decodeImage(Common::SeekableReadStream *stream); - PixelFormat getPixelFormat() const { return _pixelFormat; } + const Graphics::Surface *decodeImage(Common::SeekableReadStream *stream); + Graphics::PixelFormat getPixelFormat() const { return _pixelFormat; } private: CinepakFrame _curFrame; int32 _y; - PixelFormat _pixelFormat; + Graphics::PixelFormat _pixelFormat; void loadCodebook(Common::SeekableReadStream *stream, uint16 strip, byte codebookType, byte chunkID, uint32 chunkSize); void decodeVectors(Common::SeekableReadStream *stream, uint16 strip, byte chunkID, uint32 chunkSize); }; -} // End of namespace Graphics +} // End of namespace Video #endif |