1 files changed, 18 insertions, 11 deletions

diff --git a/source/blender/editors/screen/screendump.c b/source/blender/editors/screen/screendump.c
index 9c05f1d4780..4644f0ae0b8 100644
--- a/source/blender/editors/screen/screendump.c
+++ b/source/blender/editors/screen/screendump.c
@@ -303,6 +303,7 @@ typedef struct ScreenshotJob {
 	const short *stop;
 	const short *do_update;
 	ReportList reports;
+	void *movie_ctx;
 } ScreenshotJob;
 
 
@@ -312,7 +313,10 @@ static void screenshot_freejob(void *sjv)
 	
 	if (sj->dumprect)
 		MEM_freeN(sj->dumprect);
-	
+
+	if (sj->movie_ctx)
+		MEM_freeN(sj->movie_ctx);
+
 	MEM_freeN(sj);
 }
 
@@ -337,20 +341,21 @@ static void screenshot_startjob(void *sjv, short *stop, short *do_update, float
 {
 	ScreenshotJob *sj = sjv;
 	RenderData rd = sj->scene->r;
-	bMovieHandle *mh = BKE_movie_handle_get(sj->scene->r.im_format.imtype);
-	
+	bMovieHandle *mh = NULL;
+
 	/* we need this as local variables for renderdata */
 	rd.frs_sec = U.scrcastfps;
 	rd.frs_sec_base = 1.0f;
 	
 	if (BKE_imtype_is_movie(rd.im_format.imtype)) {
-		if (!mh->start_movie(sj->scene, &rd, sj->dumpsx, sj->dumpsy, &sj->reports)) {
+		mh = BKE_movie_handle_get(sj->scene->r.im_format.imtype);
+		sj->movie_ctx = mh->context_create();
+
+		if (!mh->start_movie(sj->movie_ctx, sj->scene, &rd, sj->dumpsx, sj->dumpsy, &sj->reports, false, "")) {
 			printf("screencast job stopped\n");
 			return;
 		}
 	}
-	else
-		mh = NULL;
 	
 	sj->stop = stop;
 	sj->do_update = do_update;
@@ -362,8 +367,8 @@ static void screenshot_startjob(void *sjv, short *stop, short *do_update, float
 		if (sj->dumprect) {
 			
 			if (mh) {
-				if (mh->append_movie(&rd, rd.sfra, rd.cfra, (int *)sj->dumprect,
-				                     sj->dumpsx, sj->dumpsy, &sj->reports))
+				if (mh->append_movie(sj->movie_ctx, &rd, rd.sfra, rd.cfra, (int *)sj->dumprect,
+				                     sj->dumpsx, sj->dumpsy, "", &sj->reports))
 				{
 					BKE_reportf(&sj->reports, RPT_INFO, "Appended frame: %d", rd.cfra);
 					printf("Appended frame %d\n", rd.cfra);
@@ -379,7 +384,7 @@ static void screenshot_startjob(void *sjv, short *stop, short *do_update, float
 				
 				BKE_image_path_from_imformat(
 				        name, rd.pic, sj->bmain->name, rd.cfra,
-				        &rd.im_format, (rd.scemode & R_EXTENSION) != 0, true);
+				        &rd.im_format, (rd.scemode & R_EXTENSION) != 0, true, NULL);
 				
 				ibuf->rect = sj->dumprect;
 				ok = BKE_imbuf_write(ibuf, name, &rd.im_format);
@@ -410,8 +415,10 @@ static void screenshot_startjob(void *sjv, short *stop, short *do_update, float
 			PIL_sleep_ms(U.scrcastwait);
 	}
 	
-	if (mh)
-		mh->end_movie();
+	if (mh) {
+		mh->end_movie(sj->movie_ctx);
+		mh->context_free(sj->movie_ctx);
+	}
 
 	BKE_report(&sj->reports, RPT_INFO, "Screencast job stopped");
 }