[FFmpeg-cvslog] rm: Use the correct codec_data_size signedness

Luca Barbato git at videolan.org
Sat Dec 6 00:50:47 CET 2014


ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Thu Dec  4 12:00:01 2014 +0100| [1c77ead1fb14d64e6798fc5e32af04abcb3cebb4] | committer: Vittorio Giovara

rm: Use the correct codec_data_size signedness

The function takes a size and not an offset.

CC: libav-stable at libav.org
Sample-Id: rm_deadlock.rm

Signed-off-by: Luca Barbato <lu_zero at gentoo.org>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1c77ead1fb14d64e6798fc5e32af04abcb3cebb4
---

 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 304f4cf..cc30694 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 a06ea01..3aa1773 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 38fb1ec..9173dde 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;



More information about the ffmpeg-cvslog mailing list