Merge master.

[dcpomatic.git] / src / lib / trimmer.cc

diff --git a/src/lib/trimmer.cc b/src/lib/trimmer.cc
index 0746b74108d884cb2233924801f693e4614cbb50..b7afc9299452708e6a3f4d96e44a6dc070199225 100644 (file)
--- a/src/lib/trimmer.cc
+++ b/src/lib/trimmer.cc
@@ -28,7 +28,8 @@ using boost::shared_ptr;
 Trimmer::Trimmer (
        shared_ptr<Log> log,
        int video_trim_start,
-       int video_trim_end, int video_length,
+       int video_trim_end,
+       int video_length,
        int audio_sample_rate,
        float frames_per_second,
        int dcp_frames_per_second