kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

clear some warnings with new proxy code.

Browse Source
This commit is contained in:
Campbell Barton 2011-08-29 01:00:14 +00:00
parent f712234009
commit c1eb0c3783
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/imbuf/intern/indexer.c
View File

@ -51,8 +51,11 @@ static char temp_ext [] = "_part";
static int proxy_sizes[] = { IMB_PROXY_25, IMB_PROXY_50, IMB_PROXY_75, static int proxy_sizes[] = { IMB_PROXY_25, IMB_PROXY_50, IMB_PROXY_75,
IMB_PROXY_100 }; IMB_PROXY_100 };
static float proxy_fac[] = { 0.25, 0.50, 0.75, 1.00 }; 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, static int tc_types[] = { IMB_TC_RECORD_RUN, IMB_TC_FREE_RUN,
IMB_TC_INTERPOLATED_REC_DATE_FREE_RUN }; IMB_TC_INTERPOLATED_REC_DATE_FREE_RUN };
#endif
#define INDEX_FILE_VERSION 1 #define INDEX_FILE_VERSION 1
@ -398,7 +401,7 @@ static void get_tc_filename(struct anim * anim, IMB_Timecode_Type tc,
{ {
char index_dir[FILE_MAXDIR]; char index_dir[FILE_MAXDIR];
int i = IMB_timecode_to_array_index(tc); 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", "record_run%s.blen_tc", "free_run%s.blen_tc",
"interp_free_run%s.blen_tc" }; "interp_free_run%s.blen_tc" };
@ -928,7 +931,7 @@ static AviMovie * alloc_proxy_output_avi(
} }
static void index_rebuild_fallback(struct anim * anim, 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, IMB_Proxy_Size proxy_sizes_in_use,
int quality, int quality,
short *stop, short *do_update, short *stop, short *do_update,