summaryrefslogtreecommitdiff
path: root/src/mxf.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-06-13 12:51:48 +0100
committerCarl Hetherington <cth@carlh.net>2014-06-13 12:51:48 +0100
commit7bca4c05ca38b218c252b0fe98a866806d9a2ded (patch)
tree959c021c95049e3a064f3a7b377d26d78c9cc4a3 /src/mxf.cc
parent4c8229e08772f498f1ece36fff51c0be8cf3636c (diff)
Work around symbol clash with ERROR on Win32/mingw.
Diffstat (limited to 'src/mxf.cc')
-rw-r--r--src/mxf.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mxf.cc b/src/mxf.cc
index dd4d2efc..def53c15 100644
--- a/src/mxf.cc
+++ b/src/mxf.cc
@@ -98,12 +98,12 @@ MXF::equals (shared_ptr<const Content> other, EqualityOptions opt, boost::functi
shared_ptr<const MXF> other_mxf = dynamic_pointer_cast<const MXF> (other);
if (!other_mxf) {
- note (ERROR, "comparing an MXF asset with a non-MXF asset");
+ note (DCP_ERROR, "comparing an MXF asset with a non-MXF asset");
return false;
}
if (_file != other_mxf->file ()) {
- note (ERROR, "MXF names differ");
+ note (DCP_ERROR, "MXF names differ");
if (!opt.mxf_names_can_differ) {
return false;
}