diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/ffmpeg_decoder.cc | 2 | ||||
| -rw-r--r-- | src/lib/player.cc | 2 | ||||
| -rw-r--r-- | src/lib/writer.cc | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index 785a805f4..d8ee278b3 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -122,7 +122,7 @@ FFmpegDecoder::pass () /* XXX: should we reset _packet.data and size after each *_decode_* call? */ if (_decode_video) { - while (decode_video_packet ()); + while (decode_video_packet ()) {} } if (_ffmpeg_content->audio_stream() && _decode_audio) { diff --git a/src/lib/player.cc b/src/lib/player.cc index 26ded61b8..6b7dc2722 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -286,6 +286,8 @@ Player::process_audio (weak_ptr<Piece> weak_piece, shared_ptr<const AudioBuffers dcp_mapped->accumulate_channel (audio.get(), i->first, i->second); } + audio = dcp_mapped; + /* The time of this audio may indicate that some of our buffered audio is not going to be added to any more, so it can be emitted. */ diff --git a/src/lib/writer.cc b/src/lib/writer.cc index cbb84a940..6601fb2fe 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -89,7 +89,7 @@ Writer::Writer (shared_ptr<const Film> f, shared_ptr<Job> j) _film->dcp_audio_mxf_filename (), _film->dcp_video_frame_rate (), _film->dcp_audio_channels (), - _film->dcp_audio_frame_rate() + _film->dcp_audio_frame_rate () ) ); |