Merge master branch.

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

diff --git a/src/lib/dcp_video_frame.h b/src/lib/dcp_video_frame.h
index 1d434505abef04a1c7efee3d8e946ca2d07b7a26..e988b663a80493158b552a959d8b8ec09010fea3 100644 (file)
--- a/src/lib/dcp_video_frame.h
+++ b/src/lib/dcp_video_frame.h
@@ -39,8 +39,7 @@ class Subtitle;
 class EncodedData
 {
 public:
-       /** @param s Size of data, in bytes.
-        */
+       /** @param s Size of data, in bytes */
        EncodedData (int s);
 
        EncodedData (std::string f);