Mercurial > mplayer.hg
comparison mencoder.c @ 6110:7bea806b9c5f
Improvment for spu subtitles.
Removed the integreted spudec in vobsub.
Various cleanup/bugfix in vobsub (no more auto palette when a true one is
here)
HW spu rendering moved in spudec because we first need to reassable the
packet before sending them to the hw.
Spudec is now created only if nedded.
author | albeu |
---|---|
date | Fri, 17 May 2002 23:47:27 +0000 |
parents | fa5d0ec52031 |
children | 523014df7d32 |
comparison
equal
deleted
inserted
replaced
6109:d43d06d9d658 | 6110:7bea806b9c5f |
---|---|
506 | 506 |
507 // set up video encoder: | 507 // set up video encoder: |
508 | 508 |
509 if (spudec_ifo) { | 509 if (spudec_ifo) { |
510 unsigned int palette[16], width, height; | 510 unsigned int palette[16], width, height; |
511 if (vobsub_parse_ifo(spudec_ifo, palette, &width, &height, 1) >= 0) | 511 if (vobsub_parse_ifo(NULL,spudec_ifo, palette, &width, &height, 1) >= 0) |
512 vo_spudec=spudec_new_scaled(palette, sh_video->disp_w, sh_video->disp_h); | 512 vo_spudec=spudec_new_scaled(palette, sh_video->disp_w, sh_video->disp_h); |
513 } | 513 } |
514 #ifdef USE_DVDREAD | 514 #ifdef USE_DVDREAD |
515 if (vo_spudec==NULL) { | 515 if (vo_spudec==NULL) { |
516 vo_spudec=spudec_new_scaled(stream->type==STREAMTYPE_DVD?((dvd_priv_t *)(stream->priv))->cur_pgc->palette:NULL, | 516 vo_spudec=spudec_new_scaled(stream->type==STREAMTYPE_DVD?((dvd_priv_t *)(stream->priv))->cur_pgc->palette:NULL, |