[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12183] trunk/blender/source/blender/src/ sequence.c: sequence.c - compiling bugfix/hack

Joshua Leung aligorith at gmail.com
Tue Oct 2 02:00:06 CEST 2007


Revision: 12183
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12183
Author:   aligorith
Date:     2007-10-02 02:00:06 +0200 (Tue, 02 Oct 2007)

Log Message:
-----------
sequence.c - compiling bugfix/hack

When compiling Blender without FMMPEG here, compiling broke on this file after the prefetch buffering commit. I've added some #ifdefs to fix this in the meantime, but Peter should check.

Modified Paths:
--------------
    trunk/blender/source/blender/src/sequence.c

Modified: trunk/blender/source/blender/src/sequence.c
===================================================================
--- trunk/blender/source/blender/src/sequence.c	2007-10-01 23:13:48 UTC (rev 12182)
+++ trunk/blender/source/blender/src/sequence.c	2007-10-02 00:00:06 UTC (rev 12183)
@@ -70,7 +70,10 @@
 #include "RE_pipeline.h"		// talks to entire render API
 
 #include "blendef.h"
+
+#ifdef WITH_FFMPEG
 #include <pthread.h>
+#endif
 
 int seqrectx, seqrecty;
 
@@ -1180,6 +1183,7 @@
 
 }
 
+#ifdef WITH_FFMPEG /* threading api only available if ffmpeg is being compiled */
 /* threading api */
 
 static ListBase running_threads;
@@ -1496,9 +1500,35 @@
 	
 	return e ? e->ibuf : 0;
 }
+#else /* if ffmpeg not in use, here are dummy functions to prevent linking errors */
 
+void seq_start_threads()
+{
+	
+}
 
+void seq_stop_threads()
+{
+	
+}
 
+void give_ibuf_prefetch_request(int rectx, int recty, int cfra, int chanshown)
+{
+	
+}
+
+void seq_wait_for_prefetch_ready()
+{
+	
+}
+
+ImBuf * give_ibuf_threaded(int rectx, int recty, int cfra, int chanshown)
+{
+	return 0;
+}
+
+#endif 
+
 /* Functions to free imbuf and anim data on changes */
 
 static void free_imbuf_strip_elem(StripElem *se)





More information about the Bf-blender-cvs mailing list