aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-05-10 15:38:40 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-05-21 20:43:38 +0200
commite3d9bf1151c96e23815e90c65a028b05f5e752af (patch)
tree39faebf405b1ddcd1a89ecc9e55053c5cd977697 /libavformat
parentb2d31dcf04c2884ffc4df092643bd4c026e8c377 (diff)
downloadffmpeg-e3d9bf1151c96e23815e90c65a028b05f5e752af.tar.gz
avformat/subtitles: Use size_t for len
string length could theoretically be larger than int Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit a633928d47057426a9c328da594407d1c7da8a5c) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/subtitles.c4
-rw-r--r--libavformat/subtitles.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/subtitles.c b/libavformat/subtitles.c
index 67624fcf32..5bdbc8dc51 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 eb719ea770..885285cc47 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.