summaryrefslogtreecommitdiff
path: root/mj2
diff options
context:
space:
mode:
authorFrancois-Olivier Devaux <fodevaux@users.noreply.github.com>2005-05-20 07:59:01 +0000
committerFrancois-Olivier Devaux <fodevaux@users.noreply.github.com>2005-05-20 07:59:01 +0000
commit1b0a5852568c7aae059b84e977039431720414ed (patch)
tree9c93de0110d57c54564568d0c82c099af06b9e47 /mj2
parent29b6a4307a2cd5cbab6b0639ba42ce1d472b8927 (diff)
Modified mj2_init_stdmovie. Check for division by zero at line 212: tk->sample[j].sample_delta = tk->timescale / tk->sample_rate;
Thanks to Valentin Mesaros !
Diffstat (limited to 'mj2')
-rw-r--r--mj2/mj2.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/mj2/mj2.c b/mj2/mj2.c
index 9880e979..91392b75 100644
--- a/mj2/mj2.c
+++ b/mj2/mj2.c
@@ -206,8 +206,11 @@ int mj2_init_stdmovie(mj2_movie_t * movie)
tk->sampletochunk[0].samples_per_chunk = 1;
tk->sampletochunk[0].sample_descr_idx = 1;
- for (j = 0; j < tk->num_samples; j++)
+ for (j = 0; j < tk->num_samples; j++) {
+ if (tk->sample_rate == 0)
+ tk->sample_rate = 25;
tk->sample[j].sample_delta = tk->timescale / tk->sample_rate;
+ }
tk->num_tts = 1;
tk->tts = (mj2_tts_t *) malloc(tk->num_tts * sizeof(mj2_tts_t));