archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

== Sequencer ==

Browse Source 
Added include compiler switches for windows to make pthread.h accessible
and reverted Joshua's patch.
(Joshua: the prefetch buffering has _nothing_ to do with FFMPEG!)

If this still does not fix the problem, please send an email to me!

I also fixed 
source\blender\src\sequence.c(1405) : error C2275: 'PrefetchThread'

GCC is way to gracefully in latest versions... :)
This commit is contained in:
Peter Schlaile
2007-10-02 12:36:53 +00:00
parent 5359507859
commit df46549325
8 changed files with 21 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
source/blender/src/sequence.c
View File

@@ -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 */