summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-06-18 13:29:43 +0100
committerCarl Hetherington <cth@carlh.net>2014-06-18 13:29:43 +0100
commitc33fc4d10ee3a3b62ccc1b8122c791d4dfd61a60 (patch)
treecc5df8bfb5e1b9d6f053a8538ae0c6be947992bc
parentb1d5ecd2b990ec8316386037bcc2186b42837cd5 (diff)
Fix awful thinko causing Playlist::active_frame_rate_change to return the wrong thing sometimes.
-rw-r--r--ChangeLog4
-rw-r--r--src/lib/playlist.cc2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e6bc2126c..d0f8d7b3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-18 Carl Hetherington <cth@carlh.net>
+
+ * Fix thinko causing incorrect audio sample rates in some cases.
+
2014-06-15 Carl Hetherington <cth@carlh.net>
* Version 1.69.28 released.
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 247c4837b..dc87fbfab 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -404,7 +404,7 @@ Playlist::active_frame_rate_change (Time t, int dcp_video_frame_rate) const
for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
shared_ptr<const VideoContent> vc = dynamic_pointer_cast<const VideoContent> (*i);
if (!vc) {
- break;
+ continue;
}
if (vc->position() >= t && t < vc->end()) {