diff options
| author | Martin Poirier <theeth@yahoo.com> | 2009-01-04 22:10:57 +0300 |
|---|---|---|
| committer | Martin Poirier <theeth@yahoo.com> | 2009-01-04 22:10:57 +0300 |
| commit | d19e758964e7d5e46c99cf019ec6f94f9eec7473 (patch) | |
| tree | dad04176cfbf714ad073ac70e642cbf1052074dd /source/blender | |
| parent | 7cd56835a37c7b72c19fc4072d3917bb182206df (diff) | |
2.5
Fix compile error with AVI support
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/BKE_writeframeserver.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/writeframeserver.c | 2 | ||||
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_writeframeserver.h b/source/blender/blenkernel/BKE_writeframeserver.h index 097a7e2f9b0..e870cbb865d 100644 --- a/source/blender/blenkernel/BKE_writeframeserver.h +++ b/source/blender/blenkernel/BKE_writeframeserver.h @@ -36,7 +36,7 @@ struct RenderData; extern void start_frameserver(struct RenderData *rd, int rectx, int recty); extern void end_frameserver(void); -extern void append_frameserver(int frame, int *pixels, int rectx, int recty); +extern void append_frameserver(struct RenderData *rd, int frame, int *pixels, int rectx, int recty); extern int frameserver_loop(struct RenderData *rd); #ifdef __cplusplus diff --git a/source/blender/blenkernel/intern/writeframeserver.c b/source/blender/blenkernel/intern/writeframeserver.c index c22c2fbe8ad..2d3a2e6b883 100644 --- a/source/blender/blenkernel/intern/writeframeserver.c +++ b/source/blender/blenkernel/intern/writeframeserver.c @@ -355,7 +355,7 @@ static void serve_ppm(int *pixels, int rectx, int recty) connsock = -1; } -void append_frameserver(int frame, int *pixels, int rectx, int recty) +void append_frameserver(RenderData *rd, int frame, int *pixels, int rectx, int recty) { fprintf(stderr, "Serving frame: %d\n", frame); if (write_ppm) { diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 729013c9cb4..1b1fa715d00 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -2503,7 +2503,7 @@ static void do_write_image_or_movie(Render *re, Scene *scene, bMovieHandle *mh) dofree = 1; } RE_ResultGet32(re, (unsigned int *)rres.rect32); - mh->append_movie(scene->r.cfra, rres.rect32, rres.rectx, rres.recty); + mh->append_movie(&re->r, scene->r.cfra, rres.rect32, rres.rectx, rres.recty); if(dofree) { MEM_freeN(rres.rect32); } |