Fix crash on analysing audio when we think the film is zero length.
authorCarl Hetherington <cth@carlh.net>
Fri, 8 Mar 2013 21:27:01 +0000 (21:27 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 8 Mar 2013 21:27:01 +0000 (21:27 +0000)
src/lib/analyse_audio_job.cc

index 41f918f34ae81b068fbf86f2f3bd64b27c87b5f4..de2632b0a7cd2556aa46086d8860548f7a0c2e07 100644 (file)
@@ -67,7 +67,7 @@ AnalyseAudioJob::run ()
        decoders.audio->Audio.connect (bind (&AnalyseAudioJob::audio, this, _1));
 
        int64_t total_audio_frames = video_frames_to_audio_frames (_film->length().get(), _film->audio_stream()->sample_rate(), _film->source_frame_rate());
-       _samples_per_point = total_audio_frames / _num_points;
+       _samples_per_point = min (1, total_audio_frames / _num_points);
 
        _current.resize (_film->audio_stream()->channels ());
        _analysis.reset (new AudioAnalysis (_film->audio_stream()->channels()));