kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

== Sequencer / proxies ==

Browse Source 
fixed crash pointed out by blendervse:
100%-proxy could lead to a segfault under certain conditions.
This commit is contained in:
Peter Schlaile 2011-08-28 19:58:33 +00:00
parent 28feca36d7
commit 80459d97c7
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/imbuf/intern/indexer.c
View File

@ -573,11 +573,15 @@ static int add_to_proxy_output_ffmpeg(
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",