diff options
Diffstat (limited to 'source/blender/src/sequence.c')
| -rw-r--r-- | source/blender/src/sequence.c | 35 |
1 files changed, 2 insertions, 33 deletions
diff --git a/source/blender/src/sequence.c b/source/blender/src/sequence.c index 84ccf1a0311..e55cea7de59 100644 --- a/source/blender/src/sequence.c +++ b/source/blender/src/sequence.c @@ -71,9 +71,7 @@ #include "blendef.h" -#ifdef WITH_FFMPEG #include <pthread.h> -#endif int seqrectx, seqrecty; @@ -1183,7 +1181,6 @@ 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; @@ -1396,14 +1393,14 @@ void give_ibuf_prefetch_request(int rectx, int recty, int cfra, int chanshown) void seq_wait_for_prefetch_ready() { + PrefetchThread *tslot; + if (seq_thread_shutdown) { return; } fprintf(stderr, "SEQ-THREAD: rendering prefetch frames...\n"); - PrefetchThread *tslot; - pthread_mutex_lock(&prefetch_ready_lock); for(;;) { @@ -1500,34 +1497,6 @@ 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 */ |