diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c
index 3093b22d1e..e89b3914f0 100644
--- a/libmpdemux/demux_lavf.c
+++ b/libmpdemux/demux_lavf.c
@@ -221,7 +221,8 @@ static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) {
     AVStream *st= avfc->streams[i];
     AVCodecContext *codec= st->codec;
     AVMetadataTag *lang = av_metadata_get(st->metadata, "language", NULL, 0);
-    int g, override_tag = av_codec_get_tag(mp_wav_override_taglists, codec->codec_id);
+    int g, override_tag = av_codec_get_tag(mp_codecid_override_taglists,
+                                           codec->codec_id);
     // For some formats (like PCM) always trust CODEC_ID_* more than codec_tag
     if (override_tag)
         codec->codec_tag = override_tag;
diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c
index ad1eb766ec..1e7b1708a0 100644
--- a/libmpdemux/mp_taglists.c
+++ b/libmpdemux/mp_taglists.c
@@ -54,7 +54,7 @@ static const AVCodecTag mp_wav_tags[] = {
 
 const struct AVCodecTag *mp_wav_taglists[] = {ff_codec_wav_tags, mp_wav_tags, 0};
 
-static const AVCodecTag mp_wav_override_tags[] = {
+static const AVCodecTag mp_codecid_override_tags[] = {
     { CODEC_ID_PCM_S8,            MKTAG('t', 'w', 'o', 's')},
     { CODEC_ID_PCM_U8,            1},
     { CODEC_ID_PCM_S16BE,         MKTAG('t', 'w', 'o', 's')},
@@ -71,7 +71,8 @@ static const AVCodecTag mp_wav_override_tags[] = {
     { 0, 0 },
 };
 
-const struct AVCodecTag *mp_wav_override_taglists[] = {mp_wav_override_tags, 0};
+const struct AVCodecTag *mp_codecid_override_taglists[] =
+                        {mp_codecid_override_tags, 0};
 
 static const AVCodecTag mp_bmp_tags[] = {
     { CODEC_ID_AMV,               MKTAG('A', 'M', 'V', 'V')},
diff --git a/libmpdemux/mp_taglists.h b/libmpdemux/mp_taglists.h
index a5262652b7..5df8648c84 100644
--- a/libmpdemux/mp_taglists.h
+++ b/libmpdemux/mp_taglists.h
@@ -21,7 +21,7 @@
 
 extern const struct AVCodecTag *mp_wav_taglists[];
 
-extern const struct AVCodecTag *mp_wav_override_taglists[];
+extern const struct AVCodecTag *mp_codecid_override_taglists[];
 
 extern const struct AVCodecTag *mp_bmp_taglists[];