Commit 6871c171 authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos

lavf/matroskadec: Simplify string length calculation.

FFmpeg relies on sizeof(char) == 1.
parent 10f46815
...@@ -3931,11 +3931,11 @@ static int webm_dash_manifest_cues(AVFormatContext *s, int64_t init_range) ...@@ -3931,11 +3931,11 @@ static int webm_dash_manifest_cues(AVFormatContext *s, int64_t init_range)
// store cue point timestamps as a comma separated list for checking subsegment alignment in // store cue point timestamps as a comma separated list for checking subsegment alignment in
// the muxer. assumes that each timestamp cannot be more than 20 characters long. // the muxer. assumes that each timestamp cannot be more than 20 characters long.
buf = av_malloc_array(s->streams[0]->nb_index_entries, 20 * sizeof(char)); buf = av_malloc_array(s->streams[0]->nb_index_entries, 20);
if (!buf) return -1; if (!buf) return -1;
strcpy(buf, ""); strcpy(buf, "");
for (i = 0; i < s->streams[0]->nb_index_entries; i++) { for (i = 0; i < s->streams[0]->nb_index_entries; i++) {
int ret = snprintf(buf + end, 20 * sizeof(char), int ret = snprintf(buf + end, 20,
"%" PRId64, s->streams[0]->index_entries[i].timestamp); "%" PRId64, s->streams[0]->index_entries[i].timestamp);
if (ret <= 0 || (ret == 20 && i == s->streams[0]->nb_index_entries - 1)) { if (ret <= 0 || (ret == 20 && i == s->streams[0]->nb_index_entries - 1)) {
av_log(s, AV_LOG_ERROR, "timestamp too long.\n"); av_log(s, AV_LOG_ERROR, "timestamp too long.\n");
...@@ -3944,7 +3944,7 @@ static int webm_dash_manifest_cues(AVFormatContext *s, int64_t init_range) ...@@ -3944,7 +3944,7 @@ static int webm_dash_manifest_cues(AVFormatContext *s, int64_t init_range)
} }
end += ret; end += ret;
if (i != s->streams[0]->nb_index_entries - 1) { if (i != s->streams[0]->nb_index_entries - 1) {
strncat(buf, ",", sizeof(char)); strncat(buf, ",", 1);
end++; end++;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment