Committing the rest of the VideoDecoder Rewrite from patch #2963496.

svn-id: r49079

4 files changed, 6 insertions, 1 deletions

diff --git a/graphics/video/codecs/codec.h b/graphics/video/codecs/codec.h
index 124d1bc49d..4a280a81df 100644
--- a/graphics/video/codecs/codec.h
+++ b/graphics/video/codecs/codec.h
@@ -28,6 +28,7 @@
 
 #include "common/stream.h"
 #include "graphics/surface.h"
+#include "graphics/pixelformat.h"
 
 namespace Graphics {
 
@@ -35,7 +36,9 @@ class Codec {
 public:
 	Codec() {}
 	virtual ~Codec() {}
+
 	virtual Surface *decodeImage(Common::SeekableReadStream *stream) = 0;
+	virtual PixelFormat getPixelFormat() const = 0;
 };
 
 } // End of namespace Graphics
diff --git a/graphics/video/codecs/msrle.h b/graphics/video/codecs/msrle.h
index 634fe754ba..819e66a0bd 100644
--- a/graphics/video/codecs/msrle.h
+++ b/graphics/video/codecs/msrle.h
@@ -36,6 +36,7 @@ public:
 	~MSRLEDecoder();
 
 	Surface *decodeImage(Common::SeekableReadStream *stream);
+	PixelFormat getPixelFormat() const { return PixelFormat::createFormatCLUT8(); }
 
 private:
 	byte _bitsPerPixel;
diff --git a/graphics/video/codecs/msvideo1.cpp b/graphics/video/codecs/msvideo1.cpp
index 16596926fd..f37bdbbf95 100644
--- a/graphics/video/codecs/msvideo1.cpp
+++ b/graphics/video/codecs/msvideo1.cpp
@@ -125,7 +125,7 @@ void MSVideo1Decoder::decode8(Common::SeekableReadStream *stream) {
     }
 }
 
-Graphics::Surface *MSVideo1Decoder::decodeImage(Common::SeekableReadStream *stream) {
+Surface *MSVideo1Decoder::decodeImage(Common::SeekableReadStream *stream) {
 	if (_bitsPerPixel == 8)
 		decode8(stream);
 	else {
diff --git a/graphics/video/codecs/msvideo1.h b/graphics/video/codecs/msvideo1.h
index ff6ffc6549..e07267476d 100644
--- a/graphics/video/codecs/msvideo1.h
+++ b/graphics/video/codecs/msvideo1.h
@@ -36,6 +36,7 @@ public:
 	~MSVideo1Decoder();
 
 	Surface *decodeImage(Common::SeekableReadStream *stream);
+	PixelFormat getPixelFormat() const { return PixelFormat::createFormatCLUT8(); }
 
 private:
 	byte _bitsPerPixel;