comparison libmpdemux/demux_mkv.c @ 14561:a226d301eec1

Handle missing palettes in the info part of VobSubs in Matroska files correctly by giving mplayer a NULL pointer. This way it will use a default palette instead of black only. Patch by Csillag Kristof (fenwick () freemail ! hu)
author mosu
date Fri, 21 Jan 2005 18:25:44 +0000
parents 35a6c4db00ae
children bbb693d3b130
comparison
equal deleted inserted replaced
14560:1481e9c76eb5 14561:a226d301eec1
371 t->sh_sub.palette[7], t->sh_sub.palette[8], 371 t->sh_sub.palette[7], t->sh_sub.palette[8],
372 t->sh_sub.palette[9], t->sh_sub.palette[10], 372 t->sh_sub.palette[9], t->sh_sub.palette[10],
373 t->sh_sub.palette[11], t->sh_sub.palette[12], 373 t->sh_sub.palette[11], t->sh_sub.palette[12],
374 t->sh_sub.palette[13], t->sh_sub.palette[14], 374 t->sh_sub.palette[13], t->sh_sub.palette[14],
375 t->sh_sub.palette[15]); 375 t->sh_sub.palette[15]);
376 t->sh_sub.has_palette = 1;
376 return 2; 377 return 2;
377 } 378 }
378 return 0; 379 return 0;
379 } 380 }
380 381
478 if (buf == NULL) 479 if (buf == NULL)
479 return 0; 480 return 0;
480 memcpy(buf, t->private_data, t->private_size); 481 memcpy(buf, t->private_data, t->private_size);
481 buf[t->private_size] = 0; 482 buf[t->private_size] = 0;
482 t->sh_sub.type = 'v'; 483 t->sh_sub.type = 'v';
484 t->sh_sub.has_palette = 0;
483 485
484 pos = buf; 486 pos = buf;
485 start = buf; 487 start = buf;
486 last = 0; 488 last = 0;
487 do 489 do