diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-08 14:57:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-08 14:57:41 +0100 |
| commit | 6c17ff84ad8f2be64ddc9bd4955e1cc87842ac29 (patch) | |
| tree | 48f9a7c9169dc29106f18a4ed13010e255d52bcb /libavfilter | |
| parent | 80f91a70be5f03fc95eb89d222d760eeaf91b135 (diff) | |
| parent | efa7f4202088c70caba11d7834641bc6eaf41830 (diff) | |
| download | ffmpeg-6c17ff84ad8f2be64ddc9bd4955e1cc87842ac29.tar.gz | |
Merge commit 'efa7f4202088c70caba11d7834641bc6eaf41830'
* commit 'efa7f4202088c70caba11d7834641bc6eaf41830':
Use the avstring.h locale-independent character type functions
avstring: Add locale independent versions of some ctype.h functions
Conflicts:
avprobe.c
doc/APIchanges
libavcodec/dvdsubdec.c
libavcodec/utils.c
libavutil/avstring.c
libavutil/avstring.h
libavutil/eval.c
libavutil/parseutils.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/af_channelmap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c index 6fe8704694..44ed717688 100644 --- a/libavfilter/af_channelmap.c +++ b/libavfilter/af_channelmap.c @@ -149,17 +149,17 @@ static av_cold int channelmap_init(AVFilterContext *ctx, const char *args) } else { char *dash = strchr(mapping, '-'); if (!dash) { // short mapping - if (isdigit(*mapping)) + if (av_isdigit(*mapping)) mode = MAP_ONE_INT; else mode = MAP_ONE_STR; - } else if (isdigit(*mapping)) { - if (isdigit(*(dash+1))) + } else if (av_isdigit(*mapping)) { + if (av_isdigit(*(dash+1))) mode = MAP_PAIR_INT_INT; else mode = MAP_PAIR_INT_STR; } else { - if (isdigit(*(dash+1))) + if (av_isdigit(*(dash+1))) mode = MAP_PAIR_STR_INT; else mode = MAP_PAIR_STR_STR; |