diff options
| author | Martin Storsjö <martin@martin.st> | 2014-11-28 11:51:05 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2014-11-28 11:55:42 +0200 |
| commit | fcae9f212a6001d966c52dc22cd4b22e9851b428 (patch) | |
| tree | a1375681941337e9c199f93a181f04cfbb73d8cc | |
| parent | a9d8d35e4833fc4dfbf557ce73c84e9ca6224427 (diff) | |
| download | ffmpeg-fcae9f212a6001d966c52dc22cd4b22e9851b428.tar.gz | |
dashenc: Avoid a VLA-like construct
This fixes the build on compilers that interpreted the earlier
code as a variable length array (which we intentionally disallow).
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | libavformat/dashenc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 9a8169e167..b3b1ac1d91 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -308,8 +308,7 @@ static void dash_fill_tmpl_params(char *dst, size_t buffer_size, int dst_pos = 0; const char *t_cur = template; while (dst_pos < buffer_size - 1 && *t_cur) { - int format_tag_size = 7; - char format_tag[format_tag_size]; // May be "%d", "%0Xd", or "%0Xlld" (for $Time$), where X is in [0-9] + char format_tag[7]; // May be "%d", "%0Xd", or "%0Xlld" (for $Time$), where X is in [0-9] int n = 0; DASHTmplId id_type; const char *t_next = strchr(t_cur, '$'); // copy over everything up to the first '$' character @@ -328,7 +327,7 @@ static void dash_fill_tmpl_params(char *dst, size_t buffer_size, break; // t_cur is now pointing to a '$' character - id_type = dash_read_tmpl_id(t_cur, format_tag, format_tag_size, &t_next); + id_type = dash_read_tmpl_id(t_cur, format_tag, sizeof(format_tag), &t_next); switch (id_type) { case DASH_TMPL_ID_ESCAPE: av_strlcpy(&dst[dst_pos], "$", 2); |