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 /libavfilter | |
| 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 'libavfilter')
| -rw-r--r-- | libavfilter/af_channelmap.c | 8 | ||||
| -rw-r--r-- | libavfilter/avfiltergraph.c | 1 | ||||
| -rw-r--r-- | libavfilter/graphparser.c | 1 | ||||
| -rw-r--r-- | libavfilter/vf_libopencv.c | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c index 8b72d5bc9f..f741881f41 100644 --- a/libavfilter/af_channelmap.c +++ b/libavfilter/af_channelmap.c @@ -150,17 +150,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; diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 97af5d0323..09b32f3f42 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -20,7 +20,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <ctype.h> #include <string.h> #include "libavutil/avassert.h" diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c index 04339c8138..d48828ea24 100644 --- a/libavfilter/graphparser.c +++ b/libavfilter/graphparser.c @@ -20,7 +20,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <ctype.h> #include <string.h> #include <stdio.h> diff --git a/libavfilter/vf_libopencv.c b/libavfilter/vf_libopencv.c index e558a4a9c1..25b1c5030b 100644 --- a/libavfilter/vf_libopencv.c +++ b/libavfilter/vf_libopencv.c @@ -177,7 +177,7 @@ static int read_shape_from_file(int *cols, int *rows, int **values, const char * p++; break; } else - (*values)[*cols*i + j] = !!isgraph(*(p++)); + (*values)[*cols*i + j] = !!av_isgraph(*(p++)); } } av_file_unmap(buf, size); |