From 4c0404c70dac0b2e6b74bb7957ca0e95156ebaab Mon Sep 17 00:00:00 2001
From: Matthew Leon <ml@matthewleon.com>
Date: Wed, 19 Jul 2017 16:43:17 -0700
Subject: [PATCH] Check for MusicBrainz id3v2 tags in ffmpeg.

Addresses #82.

Previously, the ffmpeg decoder only checked for the "generic"
MusicBrainz metadata keys used in other metadata container formats.
---
 NEWS                                   | 2 ++
 src/decoder/plugins/FfmpegMetaData.cxx | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/NEWS b/NEWS
index 90867e848..bdc6ed53e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
 ver 0.20.10 (not yet released)
+* decoder
+  - ffmpeg: support MusicBrainz ID3v2 tags
 
 ver 0.20.9 (2017/06/04)
 * decoder
diff --git a/src/decoder/plugins/FfmpegMetaData.cxx b/src/decoder/plugins/FfmpegMetaData.cxx
index 24eb0cc9c..2491dbf78 100644
--- a/src/decoder/plugins/FfmpegMetaData.cxx
+++ b/src/decoder/plugins/FfmpegMetaData.cxx
@@ -24,6 +24,7 @@
 #include "FfmpegMetaData.hxx"
 #include "tag/TagTable.hxx"
 #include "tag/TagHandler.hxx"
+#include "tag/Id3MusicBrainz.hxx"
 
 extern "C" {
 #include <libavutil/dict.h>
@@ -75,6 +76,11 @@ FfmpegScanDictionary(AVDictionary *dict,
 		     i->name != nullptr; ++i)
 			FfmpegScanTag(i->type, dict, i->name,
 				      handler, handler_ctx);
+
+		for (const struct tag_table *i = musicbrainz_txxx_tags;
+		     i->name != nullptr; ++i)
+			FfmpegScanTag(i->type, dict, i->name,
+				      handler, handler_ctx);
 	}
 
 	if (handler.pair != nullptr)