[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47044] trunk/blender/source/gameengine/ VideoTexture/VideoFFmpeg.cpp: fix for own error in applying patch

Campbell Barton ideasman42 at gmail.com
Sat May 26 15:08:43 CEST 2012


Revision: 47044
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47044
Author:   campbellbarton
Date:     2012-05-26 13:08:42 +0000 (Sat, 26 May 2012)
Log Message:
-----------
fix for own error in applying patch

Modified Paths:
--------------
    trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp

Modified: trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp
===================================================================
--- trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp	2012-05-26 11:01:01 UTC (rev 47043)
+++ trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp	2012-05-26 13:08:42 UTC (rev 47044)
@@ -589,6 +589,7 @@
 	AVFormatParameters	formatParams;
 	AVRational			frameRate;
 	char				filename[28], rateStr[20];
+	char                *p;
 
 	do_init_ffmpeg();
 
@@ -630,8 +631,6 @@
 		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;




More information about the Bf-blender-cvs mailing list