[FFmpeg-devel] [PATCH] avformat/subtitles: Use size_t for len

[Michael Niedermayer]

string length could theoretically be larger than int

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
---
 libavformat/subtitles.c |    4 ++--
 libavformat/subtitles.h |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavformat/subtitles.c b/libavformat/subtitles.c
index 67624fc..5bdbc8d 100644
--- a/libavformat/subtitles.c
+++ b/libavformat/subtitles.c
@@ -109,7 +109,7 @@ int ff_text_peek_r8(FFTextReader *r)
 }
 
 AVPacket *ff_subtitles_queue_insert(FFDemuxSubtitlesQueue *q,
-                                    const uint8_t *event, int len, int merge)
+                                    const uint8_t *event, size_t len, int merge)
 {
     AVPacket *subs, *sub;
 
@@ -303,7 +303,7 @@ int ff_smil_extract_next_text_chunk(FFTextReader *tr, AVBPrint *buf, char *c)
 const char *ff_smil_get_attr_ptr(const char *s, const char *attr)
 {
     int in_quotes = 0;
-    const int len = strlen(attr);
+    const size_t len = strlen(attr);
 
     while (*s) {
         while (*s) {
diff --git a/libavformat/subtitles.h b/libavformat/subtitles.h
index eb719ea..885285c 100644
--- a/libavformat/subtitles.h
+++ b/libavformat/subtitles.h
@@ -116,7 +116,7 @@ typedef struct {
  *              previous one instead of adding a new entry, 0 otherwise
  */
 AVPacket *ff_subtitles_queue_insert(FFDemuxSubtitlesQueue *q,
-                                    const uint8_t *event, int len, int merge);
+                                    const uint8_t *event, size_t len, int merge);
 
 /**
  * Set missing durations and sort subtitles by PTS, and then byte position.
-- 
1.7.9.5