From 4dbc6ef917aeceb906b1ef1caf6911033e7e2c54 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 20 Dec 2014 23:37:57 +0000 Subject: Hand-apply d849d411cff28ef5453085791d0b4d7cd73bd070 from master; replace all assert()s with thrown exceptions. --- src/lib/ffmpeg_decoder.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/lib/ffmpeg_decoder.cc') diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index 62a3a78c3..a16799e74 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -168,12 +168,12 @@ FFmpegDecoder::pass () shared_ptr FFmpegDecoder::deinterleave_audio (uint8_t** data, int size) { - assert (_ffmpeg_content->audio_channels()); - assert (bytes_per_audio_sample()); + DCPOMATIC_ASSERT (_ffmpeg_content->audio_channels()); + DCPOMATIC_ASSERT (bytes_per_audio_sample()); /* Deinterleave and convert to float */ - assert ((size % (bytes_per_audio_sample() * _ffmpeg_content->audio_channels())) == 0); + DCPOMATIC_ASSERT ((size % (bytes_per_audio_sample() * _ffmpeg_content->audio_channels())) == 0); int const total_samples = size / bytes_per_audio_sample(); int const frames = total_samples / _ffmpeg_content->audio_channels(); -- cgit v1.2.3