[Scummvm-cvs-logs] scummvm master -> 23de05926279d4d77ce7fd0830a51b86dd5fde98

[wjp]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
23de059262 VIDEO: Make getCurFrame declaration consistent


Commit: 23de05926279d4d77ce7fd0830a51b86dd5fde98
    https://github.com/scummvm/scummvm/commit/23de05926279d4d77ce7fd0830a51b86dd5fde98
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2012-09-21T13:35:15-07:00

Commit Message:
VIDEO: Make getCurFrame declaration consistent

The declaration used int32 while the definition used int.
This should fix building on AmigaOS4 (bug #3570577).

Changed paths:
    engines/mohawk/video.cpp
    engines/mohawk/video.h
    video/video_decoder.h



diff --git a/engines/mohawk/video.cpp b/engines/mohawk/video.cpp
index 0ed4f38..b1b9972 100644
--- a/engines/mohawk/video.cpp
+++ b/engines/mohawk/video.cpp
@@ -478,7 +478,7 @@ VideoHandle VideoManager::findVideoHandle(const Common::String &filename) {
 	return NULL_VID_HANDLE;
 }
 
-int32 VideoManager::getCurFrame(VideoHandle handle) {
+int VideoManager::getCurFrame(VideoHandle handle) {
 	assert(handle != NULL_VID_HANDLE);
 	return _videoStreams[handle]->getCurFrame();
 }
diff --git a/engines/mohawk/video.h b/engines/mohawk/video.h
index 9dddcde0..6d27839 100644
--- a/engines/mohawk/video.h
+++ b/engines/mohawk/video.h
@@ -98,7 +98,7 @@ public:
 	// Handle functions
 	VideoHandle findVideoHandle(uint16 id);
 	VideoHandle findVideoHandle(const Common::String &filename);
-	int32 getCurFrame(VideoHandle handle);
+	int getCurFrame(VideoHandle handle);
 	uint32 getFrameCount(VideoHandle handle);
 	uint32 getTime(VideoHandle handle);
 	uint32 getDuration(VideoHandle videoHandle);
diff --git a/video/video_decoder.h b/video/video_decoder.h
index 66980ab..59cce2e 100644
--- a/video/video_decoder.h
+++ b/video/video_decoder.h
@@ -204,7 +204,7 @@ public:
 	 * Returns the current frame number of the video.
 	 * @return the last frame decoded by the video
 	 */
-	int32 getCurFrame() const;
+	int getCurFrame() const;
 
 	/**
 	 * Returns the number of frames in the video.