diff --git a/libmpdemux/parse_mp4.c b/libmpdemux/parse_mp4.c
index cccf2ee2c5..a4b4cabf56 100644
--- a/libmpdemux/parse_mp4.c
+++ b/libmpdemux/parse_mp4.c
@@ -39,7 +39,7 @@ int mp4_read_descr_len(stream_t *s) {
 int mp4_parse_esds(unsigned char *data, int datalen, esds_t *esds) {
   /* create memory stream from data */
   stream_t *s = new_memory_stream(data, datalen);
-  uint8_t len;
+  uint16_t len;
 #ifdef MP4_DUMPATOM
   {int i;
   printf("ESDS Dump (%dbyte):\n", datalen);  
diff --git a/libmpdemux/parse_mp4.h b/libmpdemux/parse_mp4.h
index aa49584409..3cf6dbcf79 100644
--- a/libmpdemux/parse_mp4.h
+++ b/libmpdemux/parse_mp4.h
@@ -87,7 +87,7 @@ typedef struct {
   uint32_t avgBitrate;
 
   /* 0x05 DecSpecificDescrTag */
-  uint8_t  decoderConfigLen;
+  uint16_t  decoderConfigLen;
   uint8_t *decoderConfig;
 
   /* 0x06 SLConfigDescrTag */