# HG changeset patch # User cboesch # Date 1307876163 0 # Node ID 30e54bd66d39a344ab866543c48cb73f17b26bb8 # Parent 65e6c1de4afa4d29338387ad52e1e87748435959 vobsub: simplify origin parsing. diff -r 65e6c1de4afa -r 30e54bd66d39 sub/vobsub.c --- a/sub/vobsub.c Sun Jun 12 10:55:24 2011 +0000 +++ b/sub/vobsub.c Sun Jun 12 10:56:03 2011 +0000 @@ -704,17 +704,14 @@ static int vobsub_parse_origin(vobsub_t *vob, const char *line) { // org: X,Y - char *p; - while (isspace(*line)) - ++line; - if (!isdigit(*line)) - return -1; - vob->origin_x = strtoul(line, &p, 10); - if (*p != ',') - return -1; - ++p; - vob->origin_y = strtoul(p, NULL, 10); - return 0; + unsigned x, y; + + if (sscanf(line, " %u,%u", &x, &y) == 2) { + vob->origin_x = x; + vob->origin_y = y; + return 0; + } + return -1; } unsigned int vobsub_palette_to_yuv(unsigned int pal)