Merge master; fix crash on new film.

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

diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc
index d735122b5ce3ccd7e8ddf6f711f6e198fd2f94ef..da51665d170809972547d227fa2735f51f18bd38 100644 (file)
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@ -47,7 +47,6 @@
 #include "dcp_video_frame.h"
 #include "lut.h"
 #include "config.h"
-#include "options.h"
 #include "exceptions.h"
 #include "server.h"
 #include "util.h"
@@ -70,7 +69,7 @@ using libdcp::Size;
  *  @param out Required size of output, in pixels (including any padding).
  *  @param s Scaler to use.
  *  @param p Number of pixels of padding either side of the image.
- *  @param f Index of the frame within the DCP's intrinsic duration.
+ *  @param f Index of the frame within the DCP.
  *  @param fps Frames per second of the Film's source.
  *  @param pp FFmpeg post-processing string to use.
  *  @param clut Colour look-up table to use (see Config::colour_lut_index ())
@@ -267,7 +266,7 @@ DCPVideoFrame::encode_locally ()
        _parameters->tcp_numlayers++;
        _parameters->cp_disto_alloc = 1;
        _parameters->cp_rsiz = CINEMA2K;
-       _parameters->cp_comment = strdup (N_("DVD-o-matic"));
+       _parameters->cp_comment = strdup (N_("DCP-o-matic"));
        _parameters->cp_cinema = CINEMA2K_24;
 
        /* 3 components, so use MCT */