[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39764] trunk/blender/source/blender/imbuf /intern/indexer.c: clear some warnings with new proxy code.

Campbell Barton ideasman42 at gmail.com
Mon Aug 29 03:00:15 CEST 2011


Revision: 39764
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39764
Author:   campbellbarton
Date:     2011-08-29 01:00:14 +0000 (Mon, 29 Aug 2011)
Log Message:
-----------
clear some warnings with new proxy code.

Modified Paths:
--------------
    trunk/blender/source/blender/imbuf/intern/indexer.c

Modified: trunk/blender/source/blender/imbuf/intern/indexer.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/indexer.c	2011-08-29 00:46:56 UTC (rev 39763)
+++ trunk/blender/source/blender/imbuf/intern/indexer.c	2011-08-29 01:00:14 UTC (rev 39764)
@@ -51,8 +51,11 @@
 static int proxy_sizes[] = { IMB_PROXY_25, IMB_PROXY_50, IMB_PROXY_75,
 			     IMB_PROXY_100 };
 static float proxy_fac[] = { 0.25, 0.50, 0.75, 1.00 };
+
+#ifdef WITH_FFMPEG
 static int tc_types[] = { IMB_TC_RECORD_RUN, IMB_TC_FREE_RUN,
 			  IMB_TC_INTERPOLATED_REC_DATE_FREE_RUN };
+#endif
 
 #define INDEX_FILE_VERSION 1
 
@@ -398,7 +401,7 @@
 {
 	char index_dir[FILE_MAXDIR];
 	int i = IMB_timecode_to_array_index(tc);
-	char * index_names[] = {
+	const char * index_names[] = {
 		"record_run%s.blen_tc", "free_run%s.blen_tc",
 		"interp_free_run%s.blen_tc" };
 
@@ -928,7 +931,7 @@
 }
 
 static void index_rebuild_fallback(struct anim * anim,
-				   IMB_Timecode_Type tcs_in_use,
+				   IMB_Timecode_Type UNUSED(tcs_in_use),
 				   IMB_Proxy_Size proxy_sizes_in_use,
 				   int quality,
 				   short *stop, short *do_update, 




More information about the Bf-blender-cvs mailing list