diff options
| author | Xiao Xiangquan <xiaoxiangquan@gmail.com> | 2011-07-29 21:42:53 +0400 |
|---|---|---|
| committer | Xiao Xiangquan <xiaoxiangquan@gmail.com> | 2011-07-29 21:42:53 +0400 |
| commit | 287b24926fefe078e4baae45808a5453b5c731bc (patch) | |
| tree | e2336456d73c8b4bb5b9dad80cb475d5ea9c38d5 /source/blender/blenkernel/intern/writeavi.c | |
| parent | e382a373f5c26be3279ce91b119cce1b24bec388 (diff) | |
| parent | b948459031dd6d0f1ccc81d607a589fd7d1e8ab2 (diff) | |
merge with trunk r38787
Diffstat (limited to 'source/blender/blenkernel/intern/writeavi.c')
| -rw-r--r-- | source/blender/blenkernel/intern/writeavi.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/writeavi.c b/source/blender/blenkernel/intern/writeavi.c index ba7f9bdd415..769a3f9b11e 100644 --- a/source/blender/blenkernel/intern/writeavi.c +++ b/source/blender/blenkernel/intern/writeavi.c @@ -105,13 +105,18 @@ bMovieHandle *BKE_get_movie_handle(int imtype) mh.get_movie_path = filepath_ffmpeg; } #endif +#ifdef WITH_FRAMESERVER if (imtype == R_FRAMESERVER) { mh.start_movie = start_frameserver; mh.append_movie = append_frameserver; mh.end_movie = end_frameserver; mh.get_next_frame = frameserver_loop; } - +#endif + + /* incase all above are disabled */ + (void)imtype; + return &mh; } |