summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-07-13 17:58:51 +0100
committerCarl Hetherington <cth@carlh.net>2013-07-13 17:58:51 +0100
commit6e3bff35a4d9b829eb8e481216a748cd4505ba6c (patch)
treea785063318d4a36303ada621909349e58fe13d50
parent92d48b9531fd2f43d92351fddf5147e31b6d61b2 (diff)
More leniancy in comparions.
-rw-r--r--src/picture_asset.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/picture_asset.cc b/src/picture_asset.cc
index 74a3a55b..824ebf80 100644
--- a/src/picture_asset.cc
+++ b/src/picture_asset.cc
@@ -117,7 +117,6 @@ PictureAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt, boost:
if (
desc_A.EditRate != desc_B.EditRate ||
- desc_A.ContainerDuration != desc_B.ContainerDuration ||
desc_A.SampleRate != desc_B.SampleRate ||
desc_A.StoredWidth != desc_B.StoredWidth ||
desc_A.StoredHeight != desc_B.StoredHeight ||
@@ -140,6 +139,10 @@ PictureAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt, boost:
return false;
}
+ if (desc_A.ContainerDuration != desc_B.ContainerDuration) {
+ note (ERROR, "video container durations differ");
+ }
+
// for (unsigned int j = 0; j < ASDCP::JP2K::MaxComponents; ++j) {
// if (desc_A.ImageComponents[j] != desc_B.ImageComponents[j]) {
// notes.pack_start ("video MXF picture descriptors differ");