Merging r49300 through r49333 from trunk into soc-2011-tomato
[blender.git] / source / blender / editors / include / ED_clip.h
index 3a1d63574a6248f068b187814a6b64470ab56f2a..7cd1afd468c0c1d0e3278f05b2dc05dc60335548 100644 (file)
@@ -81,7 +81,7 @@ void ED_space_clip_set_mask(struct bContext *C, struct SpaceClip *sc, struct Mas
 
 /* textures buffer */
 int ED_space_clip_texture_buffer_supported(struct SpaceClip *sc);
-int ED_space_clip_load_movieclip_buffer(struct SpaceClip *sc, struct ImBuf *ibuf);
+int ED_space_clip_load_movieclip_buffer(struct SpaceClip *sc, struct ImBuf *ibuf, const unsigned char *display_buffer);
 void ED_space_clip_unload_movieclip_buffer(struct SpaceClip *sc);
 void ED_space_clip_free_texture_buffer(struct SpaceClip *sc);