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
This commit is contained in:
Campbell Barton 2012-05-26 10:05:22 +00:00
parent 9def1dea45
commit e727056c2e
3 changed files with 5 additions and 3 deletions

@ -136,7 +136,7 @@ void quicktime_exit(void)
#ifdef _WIN32
char *get_valid_qtname(char *name)
const char *get_valid_qtname(char *name)
{
TCHAR Buffer[MAX_PATH];
DWORD dwRet;

@ -61,7 +61,7 @@
#endif /* _WIN32 _ */
char *get_valid_qtname(char *name);
char *get_valid_qtname(const char *name);
// quicktime movie import functions

@ -588,7 +588,7 @@ void VideoFFmpeg::openCam (char * file, short camIdx)
AVInputFormat *inputFormat;
AVFormatParameters formatParams;
AVRational frameRate;
char *p, filename[28], rateStr[20];
char filename[28], rateStr[20];
do_init_ffmpeg();
@ -630,6 +630,8 @@ void VideoFFmpeg::openCam (char * file, short camIdx)
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;