summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--src/lib/player.cc2
2 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 481cd16dc..22eba9726 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2018-03-24 Carl Hetherington <cth@carlh.net>
+ * Fix crash when changing DCP audio channel count (#1253).
+
* Fix update checker error when there is no test
version.
diff --git a/src/lib/player.cc b/src/lib/player.cc
index e8005c655..7e2f8ad08 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -283,6 +283,8 @@ Player::film_changed (Film::Property p)
if (_film->audio_processor ()) {
_audio_processor = _film->audio_processor()->clone (_film->audio_frame_rate ());
}
+ } else if (p == Film::AUDIO_CHANNELS) {
+ _audio_merger.clear ();
}
}