diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c
index c8432145ce79947e199e827c1bb1f8e8d7706254..067d4fafe93c8c5b40efdd5f0375b788f09f63a5 100644
--- a/libavformat/flacdec.c
+++ b/libavformat/flacdec.c
@@ -146,4 +146,5 @@ AVInputFormat flac_demuxer = {
     .flags= AVFMT_GENERIC_INDEX,
     .extensions = "flac",
     .value = CODEC_ID_FLAC,
+    .metadata_conv = ff_vorbiscomment_metadata_conv,
 };
diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c
index 5362489f5c48cb9850a9ca8f1c64d37e89bfdafd..5d42db765c458c2d224175223b021bd4d70f99b7 100644
--- a/libavformat/oggdec.c
+++ b/libavformat/oggdec.c
@@ -583,4 +583,5 @@ AVInputFormat ogg_demuxer = {
     NULL,
     ogg_read_timestamp,
     .extensions = "ogg",
+    .metadata_conv = ff_vorbiscomment_metadata_conv,
 };
diff --git a/libavformat/oggdec.h b/libavformat/oggdec.h
index cbba414626ad303432f15973327f40c745812258..91a59742ff2910eee96533704eec5d174c98a1da 100644
--- a/libavformat/oggdec.h
+++ b/libavformat/oggdec.h
@@ -26,6 +26,7 @@
 #define AVFORMAT_OGGDEC_H
 
 #include "avformat.h"
+#include "metadata.h"
 
 struct ogg_codec {
     const int8_t *magic;
@@ -91,6 +92,8 @@ extern const struct ogg_codec ff_speex_codec;
 extern const struct ogg_codec ff_theora_codec;
 extern const struct ogg_codec ff_vorbis_codec;
 
+extern const AVMetadataConv ff_vorbiscomment_metadata_conv[];
+
 int vorbis_comment(AVFormatContext *ms, uint8_t *buf, int size);
 
 #endif /* AVFORMAT_OGGDEC_H */
diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c
index 8eb1f4789ce5ee1a871edac9abc47944dee95fdc..5b45631ab620e156e5f700d6f691876939fc7358 100644
--- a/libavformat/oggparsevorbis.c
+++ b/libavformat/oggparsevorbis.c
@@ -30,6 +30,21 @@
 #include "avformat.h"
 #include "oggdec.h"
 
+/**
+ * VorbisComment metadata conversion mapping.
+ * from Ogg Vorbis I format specification: comment field and header specification
+ * http://xiph.org/vorbis/doc/v-comment.html
+ */
+const AVMetadataConv ff_vorbiscomment_metadata_conv[] = {
+    { "ARTIST"     , "author" },
+    { "TITLE"      , "title"  },
+    { "ALBUM"      , "album"  },
+    { "DATE"       , "year"   },
+    { "TRACKNUMBER", "track"  },
+    { "GENRE"      , "genre"  },
+    { 0 }
+};
+
 int
 vorbis_comment(AVFormatContext * as, uint8_t *buf, int size)
 {