diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-05-26 17:08:42 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-26 17:08:42 +0400 |
commit | ba5e13912d4ce132bb8a20f490e24c0cc13b72a3 (patch) | |
tree | f571b49afe0badc4e362ee83e9cc8429ff3c8f10 /source/gameengine/VideoTexture | |
parent | 63788b47d6e805a97aac1501d3e64e1ada7e40b3 (diff) |
fix for own error in applying patch
Diffstat (limited to 'source/gameengine/VideoTexture')
-rw-r--r-- | source/gameengine/VideoTexture/VideoFFmpeg.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/gameengine/VideoTexture/VideoFFmpeg.cpp b/source/gameengine/VideoTexture/VideoFFmpeg.cpp index 74f1d9ee5f3..f4d3fb75223 100644 --- a/source/gameengine/VideoTexture/VideoFFmpeg.cpp +++ b/source/gameengine/VideoTexture/VideoFFmpeg.cpp @@ -589,6 +589,7 @@ void VideoFFmpeg::openCam (char * file, short camIdx) AVFormatParameters formatParams; AVRational frameRate; char filename[28], rateStr[20]; + char *p; do_init_ffmpeg(); @@ -630,8 +631,6 @@ 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; |