[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47042] trunk/blender/source: patch [ #31265] Warning Fixes 02/05/2012

[Campbell Barton]

Revision: 47042
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47042
Author:   campbellbarton
Date:     2012-05-26 10:05:22 +0000 (Sat, 26 May 2012)
Log Message:
-----------
patch [#31265] Warning Fixes 02/05/2012
from Jason Wilkins (jwilkins) 

only applied some parts:
* const correctness
* moved a variable into a move local scope so it is also inside a #if/endif and does not end up conditionally unused

Modified Paths:
--------------
    trunk/blender/source/blender/quicktime/apple/quicktime_import.c
    trunk/blender/source/blender/quicktime/quicktime_import.h
    trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp

Modified: trunk/blender/source/blender/quicktime/apple/quicktime_import.c
===================================================================
--- trunk/blender/source/blender/quicktime/apple/quicktime_import.c	2012-05-26 09:55:00 UTC (rev 47041)
+++ trunk/blender/source/blender/quicktime/apple/quicktime_import.c	2012-05-26 10:05:22 UTC (rev 47042)
@@ -136,7 +136,7 @@
 
 
 #ifdef _WIN32
-char *get_valid_qtname(char *name)
+const char *get_valid_qtname(char *name)
 {
 	TCHAR Buffer[MAX_PATH];
 	DWORD dwRet;

Modified: trunk/blender/source/blender/quicktime/quicktime_import.h
===================================================================
--- trunk/blender/source/blender/quicktime/quicktime_import.h	2012-05-26 09:55:00 UTC (rev 47041)
+++ trunk/blender/source/blender/quicktime/quicktime_import.h	2012-05-26 10:05:22 UTC (rev 47042)
@@ -61,7 +61,7 @@
 #endif /* _WIN32 _ */
 
 
-char *get_valid_qtname(char *name);
+char *get_valid_qtname(const char *name);
 
 
 // quicktime movie import functions

Modified: trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp
===================================================================
--- trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp	2012-05-26 09:55:00 UTC (rev 47041)
+++ trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp	2012-05-26 10:05:22 UTC (rev 47042)
@@ -588,7 +588,7 @@
 	AVInputFormat		*inputFormat;
 	AVFormatParameters	formatParams;
 	AVRational			frameRate;
-	char				*p, filename[28], rateStr[20];
+	char				filename[28], rateStr[20];
 
 	do_init_ffmpeg();
 
@@ -630,6 +630,8 @@
 		return;
 	if (file && strncmp(file, "/dev", 4) == 0) 
 	{
+		char *p;
+
 		// user does not specify a driver
 		strncpy(filename, file, sizeof(filename));
 		filename[sizeof(filename)-1] = 0;