diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-21 16:33:19 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-21 16:33:19 +0400 |
| commit | 2df82a2a2be909e0a1208ed2fe41637f24436414 (patch) | |
| tree | a89c92df23c951a8dc31cffd58b999545e058ac9 /source/gameengine/VideoTexture | |
| parent | d6f38e4e018a75458290e3ed26dd80c2cf0af882 (diff) | |
Code cleanup: fix some vs2012 compiler warnings
Diffstat (limited to 'source/gameengine/VideoTexture')
| -rw-r--r-- | source/gameengine/VideoTexture/VideoFFmpeg.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/gameengine/VideoTexture/VideoFFmpeg.cpp b/source/gameengine/VideoTexture/VideoFFmpeg.cpp index be7f9392f39..7b48d47232b 100644 --- a/source/gameengine/VideoTexture/VideoFFmpeg.cpp +++ b/source/gameengine/VideoTexture/VideoFFmpeg.cpp @@ -584,7 +584,6 @@ void VideoFFmpeg::openCam (char *file, short camIdx) AVInputFormat *inputFormat; AVDictionary *formatParams = NULL; char filename[28], rateStr[20]; - char *p; #ifdef WIN32 // video capture on windows only through Video For Windows driver @@ -608,6 +607,8 @@ void VideoFFmpeg::openCam (char *file, short camIdx) // /dev/ieee1394/1:ntsc // dv1394:secam // v4l:pal + char *p; + if (file && strstr(file, "1394") != NULL) { // the user specifies a driver, check if it is v4l or d41394 |