# HG changeset patch # User ulion # Date 1197261446 0 # Node ID fb719ee583b5923a27d46b8aa4f05af18302ffa6 # Parent 9139c368a4933245f48966bfb6d1562ea8f2b8ab Move temp variable declaration into inner loop scope. diff -r 9139c368a493 -r fb719ee583b5 libmpdemux/demux_mkv.c --- a/libmpdemux/demux_mkv.c Mon Dec 10 01:46:02 2007 +0000 +++ b/libmpdemux/demux_mkv.c Mon Dec 10 04:37:26 2007 +0000 @@ -306,13 +306,14 @@ static int vobsub_parse_palette (sh_sub_t *sh, const char *start) { - int i, tmp; + int i; start += 8; while (isspace(*start)) start++; for (i = 0; i < 16; i++) { + unsigned int tmp; if (sscanf(start, "%06x", &tmp) != 1) break; sh->palette[i] = vobsub_palette_to_yuv(tmp); @@ -356,12 +357,12 @@ use_custom_colors ? "ON" : "OFF"); if ((start = strstr(start, "colors:")) != NULL) { - unsigned int tmp; start += 7; while (isspace(*start)) start++; for (i = 0; i < 4; i++) { + unsigned int tmp; if (sscanf(start, "%06x", &tmp) != 1) break; sh->colors[i] = vobsub_rgb_to_yuv(tmp);