From 036f5c5420e4529f05fa5180f5fa28ca2c5c4065 Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Thu, 4 Dec 2014 12:00:01 +0100 Subject: [PATCH] rm: Use the correct codec_data_size signedness The function takes a size and not an offset. CC: libav-stable@libav.org Sample-Id: rm_deadlock.rm Signed-off-by: Luca Barbato --- libavformat/rdt.c | 2 +- libavformat/rm.h | 2 +- libavformat/rmdec.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libavformat/rdt.c b/libavformat/rdt.c index 304f4cf210..cc30694756 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 a06ea01a5a..3aa17732f1 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); + unsigned int codec_data_size); /** * Parse one rm-stream packet from the input bytestream. diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index 79a07566de..848d0316c6 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -282,9 +282,9 @@ 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) +int ff_rm_read_mdpr_codecdata(AVFormatContext *s, AVIOContext *pb, + AVStream *st, RMStream *rst, + unsigned int codec_data_size) { unsigned int v; int size;