diff options
author | Richard Antalik <richardantalik@gmail.com> | 2021-11-18 03:32:06 +0300 |
---|---|---|
committer | Richard Antalik <richardantalik@gmail.com> | 2021-11-18 03:32:06 +0300 |
commit | d8fd575af9cdb66dcc3e50cc3b1b5c41ad049b4f (patch) | |
tree | 5dab64c61e8fdb437f9ce2de697f78bb1cf8d9fa /source/blender/editors/space_sequencer | |
parent | b071083496638e7e96b787f524a5b9add094010d (diff) |
Fix T93154: Crash adding multiple movie strips
Some when adding multiple movies at once and only some of them have
audio track, this causes crash on NULL dereference. Issue was introduced
in bdbc7e12a02e to align sound and video properly.
Check if sound is present in movie file. If it's not, don't try to align
sound with video.
Diffstat (limited to 'source/blender/editors/space_sequencer')
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_add.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index e58e52b5e94..616953e720a 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -678,8 +678,11 @@ static void sequencer_add_movie_multiple_strips(bContext *C, load_data->start_frame += audio_frame_offset; seq_sound = SEQ_add_sound_strip(bmain, scene, ed->seqbasep, load_data, audio_skip); - int min_startdisp = MIN2(seq_movie->startdisp, seq_sound->startdisp); - int max_enddisp = MAX2(seq_movie->enddisp, seq_sound->enddisp); + int min_startdisp = 0, max_enddisp = 0; + if (seq_sound != NULL) { + min_startdisp = MIN2(seq_movie->startdisp, seq_sound->startdisp); + max_enddisp = MAX2(seq_movie->enddisp, seq_sound->enddisp); + } load_data->start_frame += max_enddisp - min_startdisp - audio_frame_offset; } |