diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 6057e34800..2c90e21ec9 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -298,7 +298,7 @@ typedef struct AVFormatContext {
     struct AVOutputFormat *oformat;
     void *priv_data;
     ByteIOContext pb;
-    int nb_streams;
+    unsigned int nb_streams;
     AVStream *streams[MAX_STREAMS];
     char filename[1024]; /* input or output filename */
     /* stream info */
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 6d5a0c98e1..276689dd5c 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -397,7 +397,7 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
             break;
         case MKTAG('s', 't', 'r', 'f'):
             /* stream header */
-            if (stream_index >= (unsigned)s->nb_streams || avi->dv_demux) {
+            if (stream_index >= s->nb_streams || avi->dv_demux) {
                 url_fskip(pb, size);
             } else {
                 st = s->streams[stream_index];