Merge Conflict Fix CL to lmp-mr1-release for ag/849478

DO NOT MERGE - libvpx: Pull from upstream

Current HEAD: 7105df53d7dc13d5e575bc8df714ec8d1da36b06

BUG=23452792

Change-Id: Ic78176fc369e0bacc71d423e0e2e6075d004aaec

struct vpx_rational arg_parse_rational(const struct arg *arg) {
 long int             rawval;
 char *endptr;
 struct vpx_rational  rat;

 /* parse numerator */
  rawval = strtol(arg->val, &endptr, 10);

 if (arg->val[0] != '\0' && endptr[0] == '/') {
 if (rawval >= INT_MIN && rawval <= INT_MAX)
      rat.num = rawval;
 else die("Option %s: Value %ld out of range for signed int\n",
               arg->name, rawval);
 } else die("Option %s: Expected / at '%c'\n", arg->name, *endptr);

 /* parse denominator */
  rawval = strtol(endptr + 1, &endptr, 10);

 if (arg->val[0] != '\0' && endptr[0] == '\0') {
 if (rawval >= INT_MIN && rawval <= INT_MAX)
      rat.den = rawval;
 else die("Option %s: Value %ld out of range for signed int\n",
               arg->name, rawval);
 } else die("Option %s: Invalid character '%c'\n", arg->name, *endptr);

 return rat;
}

struct vpx_rational arg_parse_rational(const struct arg *arg) {
 long int             rawval;
 char *endptr;
 struct vpx_rational  rat;

 /* parse numerator */
  rawval = strtol(arg->val, &endptr, 10);

 if (arg->val[0] != '\0' && endptr[0] == '/') {
 if (rawval >= INT_MIN && rawval <= INT_MAX)
      rat.num = rawval;
 else die("Option %s: Value %ld out of range for signed int\n",
               arg->name, rawval);
 } else die("Option %s: Expected / at '%c'\n", arg->name, *endptr);

 /* parse denominator */
  rawval = strtol(endptr + 1, &endptr, 10);

 if (arg->val[0] != '\0' && endptr[0] == '\0') {
 if (rawval >= INT_MIN && rawval <= INT_MAX)
      rat.den = rawval;
 else die("Option %s: Value %ld out of range for signed int\n",
               arg->name, rawval);
 } else die("Option %s: Invalid character '%c'\n", arg->name, *endptr);

 return rat;
}
