Merge remote-tracking branch 'upstream/master' into zvision

Conflicts:
	engines/zvision/animation/rlf_animation.cpp
	engines/zvision/animation_control.h
	engines/zvision/core/console.cpp
	engines/zvision/core/events.cpp
	engines/zvision/cursors/cursor.cpp
	engines/zvision/cursors/cursor_manager.cpp
	engines/zvision/cursors/cursor_manager.h
	engines/zvision/fonts/truetype_font.cpp
	engines/zvision/graphics/render_manager.cpp
	engines/zvision/graphics/render_manager.h
	engines/zvision/inventory/inventory_manager.h
	engines/zvision/inventory_manager.h
	engines/zvision/meta_animation.h
	engines/zvision/module.mk
	engines/zvision/scripting/actions.cpp
	engines/zvision/scripting/control.h
	engines/zvision/scripting/controls/animation_control.cpp
	engines/zvision/scripting/controls/animation_control.h
	engines/zvision/scripting/controls/input_control.cpp
	engines/zvision/scripting/controls/lever_control.cpp
	engines/zvision/scripting/controls/timer_node.cpp
	engines/zvision/scripting/controls/timer_node.h
	engines/zvision/scripting/puzzle.h
	engines/zvision/scripting/scr_file_handling.cpp
	engines/zvision/scripting/script_manager.cpp
	engines/zvision/scripting/script_manager.h
	engines/zvision/sidefx.cpp
	engines/zvision/sound/zork_raw.cpp
	engines/zvision/sound/zork_raw.h
	engines/zvision/video/video.cpp
	engines/zvision/video/zork_avi_decoder.h
	engines/zvision/zvision.cpp
	engines/zvision/zvision.h

1 files changed, 95 insertions, 0 deletions

diff --git a/image/codecs/indeo3.h b/image/codecs/indeo3.h
new file mode 100644
index 0000000000..0ff0265250
--- /dev/null
+++ b/image/codecs/indeo3.h
@@ -0,0 +1,95 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/scummsys.h"
+
+/* Intel Indeo 3 decompressor, derived from ffmpeg.
+ *
+ * Original copyright note:
+ * Intel Indeo 3 (IV31, IV32, etc.) video decoder for ffmpeg
+ * written, produced, and directed by Alan Smithee
+ */
+
+#ifndef IMAGE_CODECS_INDEO3_H
+#define IMAGE_CODECS_INDEO3_H
+
+#include "image/codecs/codec.h"
+
+namespace Image {
+
+/**
+ * Intel Indeo 3 decoder.
+ *
+ * Used by BMP/AVI.
+ *
+ * Used in video:
+ *  - VMDDecoder
+ */
+class Indeo3Decoder : public Codec {
+public:
+	Indeo3Decoder(uint16 width, uint16 height);
+	~Indeo3Decoder();
+
+	const Graphics::Surface *decodeFrame(Common::SeekableReadStream &stream);
+	Graphics::PixelFormat getPixelFormat() const;
+
+	static bool isIndeo3(Common::SeekableReadStream &stream);
+
+private:
+	Graphics::Surface *_surface;
+
+	Graphics::PixelFormat _pixelFormat;
+
+	static const int _corrector_type_0[24];
+	static const int _corrector_type_2[8];
+	static const uint32 correction[];
+	static const uint32 correctionloworder[];
+	static const uint32 correctionhighorder[];
+
+	struct YUVBufs {
+		byte *Ybuf;
+		byte *Ubuf;
+		byte *Vbuf;
+		byte *the_buf;
+		uint32 the_buf_size;
+		uint16 y_w, y_h;
+		uint16 uv_w, uv_h;
+	};
+
+	YUVBufs _iv_frame[2];
+	YUVBufs *_cur_frame;
+	YUVBufs *_ref_frame;
+
+	byte *_ModPred;
+	uint16 *_corrector_type;
+
+	void buildModPred();
+	void allocFrames();
+
+	void decodeChunk(byte *cur, byte *ref, int width, int height,
+			const byte *buf1, uint32 fflags2, const byte *hdr,
+			const byte *buf2, int min_width_160);
+};
+
+} // End of namespace Image
+
+#endif