Browse Source

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 a633928d47)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.4.10
Michael Niedermayer 10 years ago
parent
commit
81941153ab
2 changed files with 3 additions and 3 deletions
  1. +2
    -2
      libavformat/subtitles.c
  2. +1
    -1
      libavformat/subtitles.h

+ 2
- 2
libavformat/subtitles.c View File

@@ -106,7 +106,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;

@@ -300,7 +300,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) {


+ 1
- 1
libavformat/subtitles.h View File

@@ -114,7 +114,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.


Loading…
Cancel
Save