summaryrefslogtreecommitdiff
path: root/src/lib/dcp_video_frame.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-01-23 20:15:13 +0000
committerCarl Hetherington <cth@carlh.net>2013-01-23 20:15:13 +0000
commit420adb1fd2910fd24eb84be98169afc209f76a0e (patch)
tree91efc15ae6351a1b93e3867b6685fb3922933efc /src/lib/dcp_video_frame.h
parent4233db111cc4b1ca8a1a82b8aac96805a866ffa0 (diff)
parent742f0fb10fb38a73d517e2a8870cd03ebefefa20 (diff)
Merge master branch.
Diffstat (limited to 'src/lib/dcp_video_frame.h')
-rw-r--r--src/lib/dcp_video_frame.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/dcp_video_frame.h b/src/lib/dcp_video_frame.h
index 1d434505a..e988b663a 100644
--- 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);