diff --git a/libavformat/riff.c b/libavformat/riff.c
index b436a122d0..3f1790e9d0 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -411,6 +411,16 @@ enum AVCodecID ff_codec_guid_get_id(const AVCodecGuid *guids, ff_asf_guid guid)
     return AV_CODEC_ID_NONE;
 }
 
+const struct AVCodecTag *avformat_get_riff_video_tags(void)
+{
+    return ff_codec_bmp_tags;
+}
+
+const struct AVCodecTag *avformat_get_riff_audio_tags(void)
+{
+    return ff_codec_wav_tags;
+}
+
 #if CONFIG_MUXERS
 int64_t ff_start_tag(AVIOContext *pb, const char *tag)
 {
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 106d4e91cd..2bfff41c66 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3398,12 +3398,3 @@ int ff_add_param_change(AVPacket *pkt, int32_t channels,
     }
     return 0;
 }
-
-const struct AVCodecTag *avformat_get_riff_video_tags(void)
-{
-    return ff_codec_bmp_tags;
-}
-const struct AVCodecTag *avformat_get_riff_audio_tags(void)
-{
-    return ff_codec_wav_tags;
-}