diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2013-03-03 11:17:50 +0100 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2013-03-07 15:16:36 +0200 |
| commit | efa7f4202088c70caba11d7834641bc6eaf41830 (patch) | |
| tree | 7ef0beba253b642affcc69f634f192fdc7c12428 /libavformat/utils.c | |
| parent | 12c5c1d3e3906e18a96ec380605d2f1504fc3d3b (diff) | |
| download | ffmpeg-efa7f4202088c70caba11d7834641bc6eaf41830.tar.gz | |
Use the avstring.h locale-independent character type functions
Make sure the behavior does not change with the locale.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index be5a5caabf..a89e956d8d 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3050,11 +3050,11 @@ int av_get_frame_filename(char *buf, int buf_size, if (c == '%') { do { nd = 0; - while (isdigit(*p)) { + while (av_isdigit(*p)) { nd = nd * 10 + *p++ - '0'; } c = *p++; - } while (isdigit(c)); + } while (av_isdigit(c)); switch(c) { case '%': @@ -3255,7 +3255,7 @@ int ff_hex_to_data(uint8_t *data, const char *p) p += strspn(p, SPACE_CHARS); if (*p == '\0') break; - c = toupper((unsigned char) *p++); + c = av_toupper((unsigned char) *p++); if (c >= '0' && c <= '9') c = c - '0'; else if (c >= 'A' && c <= 'F') @@ -3365,7 +3365,7 @@ void ff_parse_key_value(const char *str, ff_parse_key_val_cb callback_get_buf, int key_len, dest_len = 0; /* Skip whitespace and potential commas. */ - while (*ptr && (isspace(*ptr) || *ptr == ',')) + while (*ptr && (av_isspace(*ptr) || *ptr == ',')) ptr++; if (!*ptr) break; @@ -3398,7 +3398,7 @@ void ff_parse_key_value(const char *str, ff_parse_key_val_cb callback_get_buf, if (*ptr == '\"') ptr++; } else { - for (; *ptr && !(isspace(*ptr) || *ptr == ','); ptr++) + for (; *ptr && !(av_isspace(*ptr) || *ptr == ','); ptr++) if (dest && dest < dest_end) *dest++ = *ptr; } |