Merge.

diff --cc src/verify.cc
index c91257be79e6ae2cec76e4298177b66bc27f7e38,a8c5001c1fe73bffde37b9b6e7dd5c79707b0338..66cd25e4e4f05605b71a4400f918a1c3f2653c14
--- 1/src/verify.cc
--- 2/src/verify.cc
+++ b/src/verify.cc
@@@ -468,8 -482,10 +485,12 @@@ dcp::note_to_string (dcp::VerificationN
                return "The DCP contains both SMPTE and Interop parts.";
        case dcp::VerificationNote::XML_VALIDATION_ERROR:
                return String::compose("An XML file is badly formed: %1 (%2:%3)", note.note().get(), note.file()->filename(), note.line().get());
 +      case dcp::VerificationNote::MISSING_ASSETMAP:
 +              return "No ASSETMAP or ASSETMAP.xml was found";
+       case dcp::VerificationNote::INTRINSIC_DURATION_TOO_SMALL:
+               return String::compose("The intrinsic duration of an asset is less than 1 second long: %1", note.note().get());
+       case dcp::VerificationNote::DURATION_TOO_SMALL:
+               return String::compose("The duration of an asset is less than 1 second long: %1", note.note().get());
        }
  
        return "";

diff --cc src/verify.h
index 89069bdd0075d7e54d287d8d97dc9be5604216c0,c56cfb9d26fd2cfbda7ce6ed4c9171b802dfec9e..38c9ee759d00aafa044914216c904694a379208b
--- 1/src/verify.h
--- 2/src/verify.h
+++ b/src/verify.h
@@@ -77,8 -77,10 +77,12 @@@ public
                MISMATCHED_STANDARD,
                /** Some XML fails to validate against the XSD/DTD */
                XML_VALIDATION_ERROR,
 +              /** No ASSETMAP{.xml} was found */
 +              MISSING_ASSETMAP
+               /** An asset's IntrinsicDuration is less than 1 second */
+               INTRINSIC_DURATION_TOO_SMALL,
+               /** An asset's Duration is less than 1 second */
+               DURATION_TOO_SMALL
        };
  
        VerificationNote (Type type, Code code)