diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-06-12 12:47:37 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-06-12 13:12:24 +0300 |
| commit | 6c44265bc96bf4ed2d40390045f18dc03602442a (patch) | |
| tree | c6a1eda3c3dc7df79a1cc44daa9abc6352cb38ee /source/blender/imbuf/intern/indexer.c | |
| parent | 34c3beb339256005c726ae9a098624c5308f54b0 (diff) | |
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
Diffstat (limited to 'source/blender/imbuf/intern/indexer.c')
| -rw-r--r-- | source/blender/imbuf/intern/indexer.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |