diff options
author | Joshua Leung <aligorith@gmail.com> | 2007-10-02 04:00:06 +0400 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2007-10-02 04:00:06 +0400 |
commit | e1ebf22921c7c57467d34fa6cf663e901b2b4964 (patch) | |
tree | d548ddb46140b1d5d77779078313b7e5087c0606 /source/blender/src/sequence.c | |
parent | 261597835a79b8640cf51bc3e20bb36227fb74bd (diff) |
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.
Diffstat (limited to 'source/blender/src/sequence.c')
-rw-r--r-- | source/blender/src/sequence.c | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/source/blender/src/sequence.c b/source/blender/src/sequence.c index 333f3d24e6e..84ccf1a0311 100644 --- a/source/blender/src/sequence.c +++ b/source/blender/src/sequence.c @@ -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 @@ ImBuf *give_ibuf_seq(int rectx, int recty, int cfra, int chanshown) } +#ifdef WITH_FFMPEG /* threading api only available if ffmpeg is being compiled */ /* threading api */ static ListBase running_threads; @@ -1496,8 +1500,34 @@ ImBuf * give_ibuf_threaded(int rectx, int recty, int cfra, int chanshown) 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 */ |