[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44547] trunk/blender/source/blender/imbuf /intern/indexer.c: Compilation error fix for recent indicer refactor commit .
Sergey Sharybin
sergey.vfx at gmail.com
Wed Feb 29 14:17:24 CET 2012
Revision: 44547
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44547
Author: nazgul
Date: 2012-02-29 13:17:11 +0000 (Wed, 29 Feb 2012)
Log Message:
-----------
Compilation error fix for recent indicer refactor commit.
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 2012-02-29 12:11:06 UTC (rev 44546)
+++ trunk/blender/source/blender/imbuf/intern/indexer.c 2012-02-29 13:17:11 UTC (rev 44547)
@@ -430,6 +430,15 @@
}
/* ----------------------------------------------------------------------
+ - common rebuilder structures
+ ---------------------------------------------------------------------- */
+
+typedef struct IndexBuildContext {
+ int anim_type;
+} IndexBuildContext;
+
+
+/* ----------------------------------------------------------------------
- ffmpeg rebuilder
---------------------------------------------------------------------- */
@@ -695,10 +704,6 @@
MEM_freeN(ctx);
}
-typedef struct IndexBuildContext {
- int anim_type;
-} IndexBuildContext;
-
typedef struct FFmpegIndexBuilderContext {
int anim_type;
@@ -718,14 +723,6 @@
IMB_Proxy_Size proxy_sizes_in_use;
} FFmpegIndexBuilderContext;
-typedef struct FallbackIndexBuilderContext {
- int anim_type;
-
- struct anim *anim;
- AviMovie *proxy_ctx[IMB_PROXY_MAX_SLOT];
- IMB_Proxy_Size proxy_sizes_in_use;
-} FallbackIndexBuilderContext;
-
static IndexBuildContext *index_ffmpeg_create_context(struct anim *anim, IMB_Timecode_Type tcs_in_use,
IMB_Proxy_Size proxy_sizes_in_use, int quality)
{
@@ -958,6 +955,14 @@
- internal AVI (fallback) rebuilder
---------------------------------------------------------------------- */
+typedef struct FallbackIndexBuilderContext {
+ int anim_type;
+
+ struct anim *anim;
+ AviMovie *proxy_ctx[IMB_PROXY_MAX_SLOT];
+ IMB_Proxy_Size proxy_sizes_in_use;
+} FallbackIndexBuilderContext;
+
static AviMovie * alloc_proxy_output_avi(
struct anim * anim, char * filename, int width, int height,
int quality)
More information about the Bf-blender-cvs
mailing list