RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-28 10:02:17 +00:00
Code Issues Releases Wiki Activity

Merge svn change r30576

Browse Source
This commit is contained in:
Uoti Urpala 2010-03-09 23:23:02 +02:00
commit fa51c3b07c
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spudec.c
View File

@ -1162,9 +1162,13 @@ static void spudec_parse_extradata(spudec_handle_t *this,
buffer[extradata_len] = 0; buffer[extradata_len] = 0;
do { do {
sscanf(ptr, "size: %dx%d", &this->orig_frame_width, &this->orig_frame_height); if (*ptr == '#')
if (sscanf(ptr, "palette: %x, %x, %x, %x, %x, %x, %x, %x," continue;
" %x, %x, %x, %x, %x, %x, %x, %x", if (!strncmp(ptr, "size: ", 6))
sscanf(ptr + 6, "%dx%d", &this->orig_frame_width, &this->orig_frame_height);
if (!strncmp(ptr, "palette: ", 9) &&
sscanf(ptr + 9, "%x, %x, %x, %x, %x, %x, %x, %x, "
"%x, %x, %x, %x, %x, %x, %x, %x",
&pal[ 0], &pal[ 1], &pal[ 2], &pal[ 3], &pal[ 0], &pal[ 1], &pal[ 2], &pal[ 3],
&pal[ 4], &pal[ 5], &pal[ 6], &pal[ 7], &pal[ 4], &pal[ 5], &pal[ 6], &pal[ 7],
&pal[ 8], &pal[ 9], &pal[10], &pal[11], &pal[ 8], &pal[ 9], &pal[10], &pal[11],
@ -1175,7 +1179,8 @@ static void spudec_parse_extradata(spudec_handle_t *this,
} }
if (!strncasecmp(ptr, "forced subs: on", 15)) if (!strncasecmp(ptr, "forced subs: on", 15))
this->forced_subs_only = 1; this->forced_subs_only = 1;
if (sscanf(ptr, "custom colors: ON, tridx: %x, colors: %x, %x, %x, %x", if (!strncmp(ptr, "custom colors: ON, tridx: ", 26) &&
sscanf(ptr + 26, "%x, colors: %x, %x, %x, %x",
&tridx, cuspal+0, cuspal+1, cuspal+2, cuspal+3) == 5) { &tridx, cuspal+0, cuspal+1, cuspal+2, cuspal+3) == 5) {
for (i=0; i<4; i++) { for (i=0; i<4; i++) {
cuspal[i] = vobsub_rgb_to_yuv(cuspal[i]); cuspal[i] = vobsub_rgb_to_yuv(cuspal[i]);