diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-01-23 20:15:13 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-01-23 20:15:13 +0000 |
| commit | 420adb1fd2910fd24eb84be98169afc209f76a0e (patch) | |
| tree | 91efc15ae6351a1b93e3867b6685fb3922933efc /src/lib/util.cc | |
| parent | 4233db111cc4b1ca8a1a82b8aac96805a866ffa0 (diff) | |
| parent | 742f0fb10fb38a73d517e2a8870cd03ebefefa20 (diff) | |
Merge master branch.
Diffstat (limited to 'src/lib/util.cc')
| -rw-r--r-- | src/lib/util.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/util.cc b/src/lib/util.cc index 0e250bb08..872985024 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -247,7 +247,7 @@ dvdomatic_setup () * @return FFmpeg crop filter string. */ string -crop_string (Position start, Size size) +crop_string (Position start, libdcp::Size size) { stringstream s; s << "crop=" << size.width << ":" << size.height << ":" << start.x << ":" << start.y; @@ -455,7 +455,6 @@ dcp_audio_channels (int f) return f; } - bool operator== (Crop const & a, Crop const & b) { return (a.left == b.left && a.right == b.right && a.top == b.top && a.bottom == b.bottom); |