diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/cpl.cc | 2 | ||||
| -rw-r--r-- | src/picture_asset.cc | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -305,9 +305,7 @@ CPL::equals (CPL const & other, EqualityOptions opt, boost::function<void (NoteT if (_length != other._length) { stringstream s; - s << "lengths differ (" << _length << " cf " << other._length << ")"; note (ERROR, String::compose ("lengths differ (%1 vs %2)", _length, other._length)); - return false; } if (_reels.size() != other._reels.size()) { diff --git a/src/picture_asset.cc b/src/picture_asset.cc index 6be50b6d..74a3a55b 100644 --- a/src/picture_asset.cc +++ b/src/picture_asset.cc @@ -275,6 +275,10 @@ MonoPictureAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt, bo assert (other_picture); for (int i = 0; i < _intrinsic_duration; ++i) { + if (i >= other_picture->intrinsic_duration()) { + return false; + } + note (PROGRESS, "Comparing video frame " + lexical_cast<string> (i) + " of " + lexical_cast<string> (_intrinsic_duration)); shared_ptr<const MonoPictureFrame> frame_A = get_frame (i); shared_ptr<const MonoPictureFrame> frame_B = other_picture->get_frame (i); |