diff options
| author | kmkaplan <kmkaplan@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-03-29 03:17:57 +0000 |
|---|---|---|
| committer | kmkaplan <kmkaplan@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-03-29 03:17:57 +0000 |
| commit | 4d38521e2cd1e62ef334a73624cbd4a95f1de436 (patch) | |
| tree | 4062471fbc1275741c53a621d3a761176cf69d2e /mplayer.c | |
| parent | 7498cf71456f9b64005250c9c780797d169ba23d (diff) | |
| download | mpv-4d38521e2cd1e62ef334a73624cbd4a95f1de436.tar.bz2 mpv-4d38521e2cd1e62ef334a73624cbd4a95f1de436.tar.xz | |
* New command line switch for mplayer & mencoder:
-ifo <ifo file>
Indicate the file that will be used to load palette and frame size
for MPEG subtitles.
* mencoder.c:
Fix cropping when decoding MPEG2.
* spudec.c:
If scaling is needed only do it once.
Change WITH_NO_ANTIALIASING to ANTIALIASING_ALGORITHM.
* vobsub.c:
Support reading info regarding size and palette from IDX file instead of IFO file.
Support streams containing audio or video.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5389 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
| -rw-r--r-- | mplayer.c | 10 |
1 files changed, 10 insertions, 0 deletions
@@ -205,6 +205,7 @@ int dvdsub_id=-1; int vobsub_id=-1; char* audio_lang=NULL; char* dvdsub_lang=NULL; +static char* spudec_ifo=NULL; static int vcd_track=0; // cache2: @@ -1107,10 +1108,19 @@ demux_info_print(demuxer); //================== Read SUBTITLES (DVD & TEXT) ========================== if(sh_video){ +current_module="spudec"; +if (spudec_ifo) { + unsigned int palette[16], width, height; + if (vobsub_parse_ifo(spudec_ifo, palette, &width, &height, 1) >= 0) + vo_spudec=spudec_new_scaled(palette, sh_video->disp_w, sh_video->disp_h); +} + #ifdef USE_DVDREAD +if (vo_spudec==NULL) { current_module="spudec_init"; vo_spudec=spudec_new_scaled(stream->type==STREAMTYPE_DVD?((dvd_priv_t *)(stream->priv))->cur_pgc->palette:NULL, sh_video->disp_w, sh_video->disp_h); +} if (vo_spudec!=NULL) inited_flags|=INITED_SPUDEC; #endif |