From 6c44265bc96bf4ed2d40390045f18dc03602442a Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Fri, 12 Jun 2015 11:47:37 +0200 Subject: Merge all changes to blenderplayer from gooseberry branch: * Allows sound playback for movies * Allow play-pause with space button * Allow displaying a position indicator with the I button --- source/blender/imbuf/intern/indexer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/imbuf/intern/indexer.c') diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c index 150ea0995ac..0509dea89d5 100644 --- a/source/blender/imbuf/intern/indexer.c +++ b/source/blender/imbuf/intern/indexer.c @@ -1006,7 +1006,7 @@ static AviMovie *alloc_proxy_output_avi( * but sane defaults help anyways...*/ float frs_sec_base = 1.0; - IMB_anim_get_fps(anim, &frs_sec, &frs_sec_base); + IMB_anim_get_fps(anim, &frs_sec, &frs_sec_base, false); x = width; y = height; -- cgit v1.2.3