Merging r50192 through r50223 from trunk into soc-2011-tomato
[blender.git] / source / blender / imbuf / IMB_imbuf.h
index f6dc673..439f52e 100644 (file)
@@ -515,5 +515,9 @@ void IMB_processor_apply_threaded(int buffer_lines, int handle_size, void *init_
                                                       void *customdata),
                                   void *(do_thread) (void *));
 
+/* ffmpeg */
+void IMB_ffmpeg_init(void);
+const char *IMB_ffmpeg_last_error(void);
+
 #endif