Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-02-29 17:17:11 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-02-29 17:17:11 +0400
commitc058ba207f7999cca40a261f43378caf68c0307d (patch)
tree5de50d12b1eac9b24a6a8291df5565a8e8e71109 /source/blender/imbuf/intern/indexer.c
parent09c96205441f814379810c2b61d59225b7afe2e3 (diff)
Compilation error fix for recent indicer refactor commit.
Diffstat (limited to 'source/blender/imbuf/intern/indexer.c')
-rw-r--r--source/blender/imbuf/intern/indexer.c29
1 files changed, 17 insertions, 12 deletions
diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c
index cc95cc0fbbe..7a2977da473 100644
--- a/source/blender/imbuf/intern/indexer.c
+++ b/source/blender/imbuf/intern/indexer.c
@@ -430,6 +430,15 @@ static void get_tc_filename(struct anim * anim, IMB_Timecode_Type tc,
}
/* ----------------------------------------------------------------------
+ - common rebuilder structures
+ ---------------------------------------------------------------------- */
+
+typedef struct IndexBuildContext {
+ int anim_type;
+} IndexBuildContext;
+
+
+/* ----------------------------------------------------------------------
- ffmpeg rebuilder
---------------------------------------------------------------------- */
@@ -695,10 +704,6 @@ static void free_proxy_output_ffmpeg(struct proxy_output_ctx * ctx,
MEM_freeN(ctx);
}
-typedef struct IndexBuildContext {
- int anim_type;
-} IndexBuildContext;
-
typedef struct FFmpegIndexBuilderContext {
int anim_type;
@@ -718,14 +723,6 @@ typedef struct FFmpegIndexBuilderContext {
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 @@ static int index_rebuild_ffmpeg(FFmpegIndexBuilderContext *context,
- 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)