summaryrefslogtreecommitdiff
path: root/src/lib/dcp_video_frame.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-05-29 23:02:00 +0100
committerCarl Hetherington <cth@carlh.net>2013-05-29 23:02:00 +0100
commit07ee845fddca9c7f4e714cf0df8f3e755af7ed81 (patch)
tree62328cf211c7d3c365e2619b00a9de12efef1f92 /src/lib/dcp_video_frame.cc
parent2c942f2794bae0500fa514281367eb4365ef59ba (diff)
Add magic lines to put the DVD-o-matic window at the front on OS X so that it gets a menu bar. Put our Rect in a namespace to hide from Carbon's version.
Diffstat (limited to 'src/lib/dcp_video_frame.cc')
-rw-r--r--src/lib/dcp_video_frame.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc
index d674393a9..77b81a658 100644
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@ -164,7 +164,7 @@ DCPVideoFrame::encode_locally ()
shared_ptr<Image> prepared = _input->scale_and_convert_to_rgb (_out_size, _padding, _scaler, true);
if (_subtitle) {
- Rect tx = subtitle_transformed_area (
+ dvdomatic::Rect tx = subtitle_transformed_area (
float (_out_size.width) / _input->size().width,
float (_out_size.height) / _input->size().height,
_subtitle->area(), _subtitle_offset, _subtitle_scale