diff --git a/src/filescanner_ffmpeg.c b/src/filescanner_ffmpeg.c
index 622ccca0..73cdcd57 100644
--- a/src/filescanner_ffmpeg.c
+++ b/src/filescanner_ffmpeg.c
@@ -165,38 +165,38 @@ parse_id3v2_disc(struct media_file_info *mfi, char *disc_string)
  */
 static const struct metadata_map md_map_id3[] =
   {
-    { "TT2",          0, mfi_offsetof(title),            NULL },              /* ID3v2.2 */
-    { "TIT2",         0, mfi_offsetof(title),            NULL },              /* ID3v2.3 */
-    { "TP1",          0, mfi_offsetof(artist),           NULL },              /* ID3v2.2 */
-    { "TPE1",         0, mfi_offsetof(artist),           NULL },              /* ID3v2.3 */
-    { "TP2",          0, mfi_offsetof(album_artist),     NULL },              /* ID3v2.2 */
-    { "TPE2",         0, mfi_offsetof(album_artist),     NULL },              /* ID3v2.3 */
-    { "TAL",          0, mfi_offsetof(album),            NULL },              /* ID3v2.2 */
-    { "TALB",         0, mfi_offsetof(album),            NULL },              /* ID3v2.3 */
-    { "TCO",          0, mfi_offsetof(genre),            NULL },              /* ID3v2.2 */
-    { "TCON",         0, mfi_offsetof(genre),            NULL },              /* ID3v2.3 */
-    { "TCM",          0, mfi_offsetof(composer),         NULL },              /* ID3v2.2 */
-    { "TCOM",         0, mfi_offsetof(composer),         NULL },              /* ID3v2.3 */
-    { "TRK",          1, mfi_offsetof(track),            parse_id3v2_track }, /* ID3v2.2 */
-    { "TRCK",         1, mfi_offsetof(track),            parse_id3v2_track }, /* ID3v2.3 */
-    { "TPA",          1, mfi_offsetof(disc),             parse_id3v2_disc },  /* ID3v2.2 */
-    { "TPOS",         1, mfi_offsetof(disc),             parse_id3v2_disc },  /* ID3v2.3 */
-    { "TYE",          1, mfi_offsetof(year),             NULL },              /* ID3v2.2 */
-    { "TYER",         1, mfi_offsetof(year),             NULL },              /* ID3v2.3 */
-    { "TDRC",         1, mfi_offsetof(year),             NULL },              /* ID3v2.4 */
-    { "TSOA",         0, mfi_offsetof(album_sort),       NULL },              /* ID3v2.4 */
-    { "XSOA",         0, mfi_offsetof(album_sort),       NULL },              /* ID3v2.3 */
-    { "TSOP",         0, mfi_offsetof(artist_sort),      NULL },              /* ID3v2.4 */
-    { "XSOP",         0, mfi_offsetof(artist_sort),      NULL },              /* ID3v2.3 */
-    { "TSOT",         0, mfi_offsetof(title_sort),       NULL },              /* ID3v2.4 */
-    { "XSOT",         0, mfi_offsetof(title_sort),       NULL },              /* ID3v2.3 */
-    { "TS2",          0, mfi_offsetof(album_artist_sort),     NULL },              /* ID3v2.2 */
-    { "TSO2",         0, mfi_offsetof(album_artist_sort),     NULL },              /* ID3v2.3 */
+    { "TT2",                 0, mfi_offsetof(title),                 NULL },              /* ID3v2.2 */
+    { "TIT2",                0, mfi_offsetof(title),                 NULL },              /* ID3v2.3 */
+    { "TP1",                 0, mfi_offsetof(artist),                NULL },              /* ID3v2.2 */
+    { "TPE1",                0, mfi_offsetof(artist),                NULL },              /* ID3v2.3 */
+    { "TP2",                 0, mfi_offsetof(album_artist),          NULL },              /* ID3v2.2 */
+    { "TPE2",                0, mfi_offsetof(album_artist),          NULL },              /* ID3v2.3 */
+    { "TAL",                 0, mfi_offsetof(album),                 NULL },              /* ID3v2.2 */
+    { "TALB",                0, mfi_offsetof(album),                 NULL },              /* ID3v2.3 */
+    { "TCO",                 0, mfi_offsetof(genre),                 NULL },              /* ID3v2.2 */
+    { "TCON",                0, mfi_offsetof(genre),                 NULL },              /* ID3v2.3 */
+    { "TCM",                 0, mfi_offsetof(composer),              NULL },              /* ID3v2.2 */
+    { "TCOM",                0, mfi_offsetof(composer),              NULL },              /* ID3v2.3 */
+    { "TRK",                 1, mfi_offsetof(track),                 parse_id3v2_track }, /* ID3v2.2 */
+    { "TRCK",                1, mfi_offsetof(track),                 parse_id3v2_track }, /* ID3v2.3 */
+    { "TPA",                 1, mfi_offsetof(disc),                  parse_id3v2_disc },  /* ID3v2.2 */
+    { "TPOS",                1, mfi_offsetof(disc),                  parse_id3v2_disc },  /* ID3v2.3 */
+    { "TYE",                 1, mfi_offsetof(year),                  NULL },              /* ID3v2.2 */
+    { "TYER",                1, mfi_offsetof(year),                  NULL },              /* ID3v2.3 */
+    { "TDRC",                1, mfi_offsetof(year),                  NULL },              /* ID3v2.4 */
+    { "TSOA",                0, mfi_offsetof(album_sort),            NULL },              /* ID3v2.4 */
+    { "XSOA",                0, mfi_offsetof(album_sort),            NULL },              /* ID3v2.3 */
+    { "TSOP",                0, mfi_offsetof(artist_sort),           NULL },              /* ID3v2.4 */
+    { "XSOP",                0, mfi_offsetof(artist_sort),           NULL },              /* ID3v2.3 */
+    { "TSOT",                0, mfi_offsetof(title_sort),            NULL },              /* ID3v2.4 */
+    { "XSOT",                0, mfi_offsetof(title_sort),            NULL },              /* ID3v2.3 */
+    { "TS2",                 0, mfi_offsetof(album_artist_sort),     NULL },              /* ID3v2.2 */
+    { "TSO2",                0, mfi_offsetof(album_artist_sort),     NULL },              /* ID3v2.3 */
     { "ALBUMARTISTSORT",     0, mfi_offsetof(album_artist_sort),     NULL },              /* ID3v2.x */
-    { "TSC",          0, mfi_offsetof(composer_sort),         NULL },              /* ID3v2.2 */
-    { "TSOC",         0, mfi_offsetof(composer_sort),         NULL },              /* ID3v2.3 */
+    { "TSC",                 0, mfi_offsetof(composer_sort),         NULL },              /* ID3v2.2 */
+    { "TSOC",                0, mfi_offsetof(composer_sort),         NULL },              /* ID3v2.3 */
 
-    { NULL,           0, 0,                              NULL }
+    { NULL,                  0, 0,                                   NULL }
   };