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/anim_movie.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/anim_movie.c')
| -rw-r--r-- | source/blender/imbuf/intern/anim_movie.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c index 0bb9f0fce51..be0b62491a7 100644 --- a/source/blender/imbuf/intern/anim_movie.c +++ b/source/blender/imbuf/intern/anim_movie.c @@ -1427,11 +1427,13 @@ int IMB_anim_get_duration(struct anim *anim, IMB_Timecode_Type tc) } bool IMB_anim_get_fps(struct anim *anim, - short *frs_sec, float *frs_sec_base) + short *frs_sec, float *frs_sec_base, bool no_av_base) { if (anim->frs_sec) { *frs_sec = anim->frs_sec; *frs_sec_base = anim->frs_sec_base; + if (no_av_base) + *frs_sec_base /= AV_TIME_BASE; return true; } return false; |