diff --git a/libavformat/aiff.h b/libavformat/aiff.h
index 5f86a378e9..e8d4cce5e2 100644
--- a/libavformat/aiff.h
+++ b/libavformat/aiff.h
@@ -46,7 +46,7 @@ static const AVCodecTag ff_codec_aiff_tags[] = {
     { CODEC_ID_PCM_S16LE,    MKTAG('s','o','w','t') },
     { CODEC_ID_ADPCM_IMA_QT, MKTAG('i','m','a','4') },
     { CODEC_ID_QDM2,         MKTAG('Q','D','M','2') },
-    { 0, 0 },
+    { CODEC_ID_NONE,         0 },
 };
 
 #endif /* AVFORMAT_AIFF_H */
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index 8175a9b1cf..12dedccbbd 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -86,7 +86,7 @@ static const struct {
     { CODEC_ID_MPEG2VIDEO, 0 },
     { CODEC_ID_PCM_S24LE,  1 },
     { CODEC_ID_PCM_S16LE,  1 },
-    { 0 }
+    { CODEC_ID_NONE }
 };
 
 static void mxf_write_wav_desc(AVFormatContext *s, AVStream *st);