summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavformat/rdt.c2
-rw-r--r--libavformat/rm.h2
-rw-r--r--libavformat/rmdec.c8
3 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/rdt.c b/libavformat/rdt.c
index 158a8212e1..212e139f31 100644
--- a/libavformat/rdt.c
+++ b/libavformat/rdt.c
@@ -132,7 +132,7 @@ static int
rdt_load_mdpr (PayloadContext *rdt, AVStream *st, int rule_nr)
{
AVIOContext pb;
- int size;
+ unsigned int size;
uint32_t tag;
/**
diff --git a/libavformat/rm.h b/libavformat/rm.h
index a72e8b7997..7b080e2a36 100644
--- a/libavformat/rm.h
+++ b/libavformat/rm.h
@@ -50,7 +50,7 @@ extern AVInputFormat ff_rdt_demuxer;
*/
int ff_rm_read_mdpr_codecdata (AVFormatContext *s, AVIOContext *pb,
AVStream *st, RMStream *rst,
- int codec_data_size, const uint8_t *mime);
+ unsigned int codec_data_size, const uint8_t *mime);
/**
* Parse one rm-stream packet from the input bytestream.
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c
index 19bd7a7a0b..d6fc59f592 100644
--- a/libavformat/rmdec.c
+++ b/libavformat/rmdec.c
@@ -303,16 +303,16 @@ static int rm_read_audio_stream_info(AVFormatContext *s, AVIOContext *pb,
return 0;
}
-int
-ff_rm_read_mdpr_codecdata (AVFormatContext *s, AVIOContext *pb,
- AVStream *st, RMStream *rst, int codec_data_size, const uint8_t *mime)
+int ff_rm_read_mdpr_codecdata(AVFormatContext *s, AVIOContext *pb,
+ AVStream *st, RMStream *rst,
+ unsigned int codec_data_size, const uint8_t *mime)
{
unsigned int v;
int size;
int64_t codec_pos;
int ret;
- if (codec_data_size < 0)
+ if (codec_data_size > INT_MAX)
return AVERROR_INVALIDDATA;
avpriv_set_pts_info(st, 64, 1, 1000);