diff --git a/src/riffvideo.cpp b/src/riffvideo.cpp
index 40f523bf96..7ca63b5f2d 100644
--- a/src/riffvideo.cpp
+++ b/src/riffvideo.cpp
@@ -655,14 +655,31 @@ void RiffVideo::StreamName(uint64_t size_) const {
 
 void RiffVideo::readInfoListChunk(uint64_t size_) {
   uint64_t current_size = DWORD;
+
+  // Add the elements to a temporary table first, so that we can check
+  // for duplicates before adding them to xmpData_.
+  std::map<std::string, std::string> table;
   while (current_size < size_) {
     std::string type = readStringTag(io_);
     size_t size = readDWORDTag(io_);
     std::string content = readStringTag(io_, size);
+<<<<<<< HEAD
     if (auto it = Internal::infoTags.find(type); it != Internal::infoTags.end())
       xmpData_[it->second] = content;
     current_size += DWORD * 2;
     current_size += size;
+=======
+    if (auto it = Internal::infoTags.find(type); it != Internal::infoTags.end()) {
+      // Check that it isn't a duplicate.
+      Internal::enforce(table.find(it->second) == table.end(), ErrorCode::kerCorruptedMetadata);
+      table[it->second] = content;
+    }
+    current_size += DWORD * 2 + size;
+>>>>>>> 2fee7b38 (Check for duplicates in RiffVideo::readInfoListChunk)
+  }
+  // Copy the elements from the temporary table to xmpData_.
+  for (const auto& it : table) {
+    xmpData_[it.first] = it.second;
   }
 }