[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39756] trunk/blender/source/blender/imbuf /intern/indexer.c: == Sequencer / proxies ==

[Peter Schlaile]

Revision: 39756
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39756
Author:   schlaile
Date:     2011-08-28 19:58:33 +0000 (Sun, 28 Aug 2011)
Log Message:
-----------
== Sequencer / proxies ==

fixed crash pointed out by blendervse:
100%-proxy could lead to a segfault under certain conditions.

Modified Paths:
--------------
    trunk/blender/source/blender/imbuf/intern/indexer.c

Modified: trunk/blender/source/blender/imbuf/intern/indexer.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/indexer.c	2011-08-28 18:54:02 UTC (rev 39755)
+++ trunk/blender/source/blender/imbuf/intern/indexer.c	2011-08-28 19:58:33 UTC (rev 39756)
@@ -573,11 +573,15 @@
 			  ctx->frame->data, ctx->frame->linesize);
 	}
 
-	ctx->frame->pts = ctx->cfra++;
+	frame = ctx->sws_ctx ? (frame ? ctx->frame : 0) : frame;
 
+	if (frame) {
+		frame->pts = ctx->cfra++;
+	}
+
 	outsize = avcodec_encode_video(
 		ctx->c, ctx->video_buffer, ctx->video_buffersize, 
-		ctx->sws_ctx ? (frame ? ctx->frame : 0) : frame);
+		frame);
 
 	if (outsize < 0) {
 		fprintf(stderr, "Error encoding proxy frame %d for '%s'\n",