From 141f9a795381fa3bbd3f2bcbd19975dfd8a8c35e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 12 Jun 2014 23:06:05 +0100 Subject: [PATCH] Merge mistake. --- src/lib/player.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/player.cc b/src/lib/player.cc index d0eb27aa3..8df7ec323 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -500,6 +500,8 @@ Player::get_audio (DCPTime time, DCPTime length, bool accurate) min (AudioFrame (all->audio->frames()), length_frames) - offset.frames (_film->audio_frame_rate ()) ); } + + return audio; } VideoFrame -- 2.30.2