diff --git a/libavformat/raw.c b/libavformat/raw.c
index 1449a20240..1af7d1118b 100644
--- a/libavformat/raw.c
+++ b/libavformat/raw.c
@@ -66,7 +66,7 @@ static int raw_write_packet(struct AVFormatContext *s, AVPacket *pkt)
 static int raw_read_header(AVFormatContext *s, AVFormatParameters *ap)
 {
     AVStream *st;
-    int id;
+    enum CodecID id;
 
     st = av_new_stream(s, 0);
     if (!st)
diff --git a/libavformat/rtmppkt.c b/libavformat/rtmppkt.c
index f6e2a9024e..e1f0647fbb 100644
--- a/libavformat/rtmppkt.c
+++ b/libavformat/rtmppkt.c
@@ -75,7 +75,7 @@ int ff_rtmp_packet_read(URLContext *h, RTMPPacket *p,
     uint8_t hdr, t, buf[16];
     int channel_id, timestamp, data_size, offset = 0;
     uint32_t extra = 0;
-    uint8_t type;
+    enum RTMPPacketType type;
 
     if (url_read(h, &hdr, 1) != 1)
         return AVERROR(EIO);