Mercurial > mplayer.hg
comparison mplayer.c @ 5388:3af2729c5c87
* 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.
author | kmkaplan |
---|---|
date | Fri, 29 Mar 2002 03:17:57 +0000 |
parents | 8a01cde9cf39 |
children | 5838af403d1a |
comparison
equal
deleted
inserted
replaced
5387:44661cb881d0 | 5388:3af2729c5c87 |
---|---|
203 int video_id=-1; | 203 int video_id=-1; |
204 int dvdsub_id=-1; | 204 int dvdsub_id=-1; |
205 int vobsub_id=-1; | 205 int vobsub_id=-1; |
206 char* audio_lang=NULL; | 206 char* audio_lang=NULL; |
207 char* dvdsub_lang=NULL; | 207 char* dvdsub_lang=NULL; |
208 static char* spudec_ifo=NULL; | |
208 static int vcd_track=0; | 209 static int vcd_track=0; |
209 | 210 |
210 // cache2: | 211 // cache2: |
211 static int stream_cache_size=0; | 212 static int stream_cache_size=0; |
212 #ifdef USE_STREAM_CACHE | 213 #ifdef USE_STREAM_CACHE |
1105 demux_info_print(demuxer); | 1106 demux_info_print(demuxer); |
1106 | 1107 |
1107 //================== Read SUBTITLES (DVD & TEXT) ========================== | 1108 //================== Read SUBTITLES (DVD & TEXT) ========================== |
1108 if(sh_video){ | 1109 if(sh_video){ |
1109 | 1110 |
1111 current_module="spudec"; | |
1112 if (spudec_ifo) { | |
1113 unsigned int palette[16], width, height; | |
1114 if (vobsub_parse_ifo(spudec_ifo, palette, &width, &height, 1) >= 0) | |
1115 vo_spudec=spudec_new_scaled(palette, sh_video->disp_w, sh_video->disp_h); | |
1116 } | |
1117 | |
1110 #ifdef USE_DVDREAD | 1118 #ifdef USE_DVDREAD |
1119 if (vo_spudec==NULL) { | |
1111 current_module="spudec_init"; | 1120 current_module="spudec_init"; |
1112 vo_spudec=spudec_new_scaled(stream->type==STREAMTYPE_DVD?((dvd_priv_t *)(stream->priv))->cur_pgc->palette:NULL, | 1121 vo_spudec=spudec_new_scaled(stream->type==STREAMTYPE_DVD?((dvd_priv_t *)(stream->priv))->cur_pgc->palette:NULL, |
1113 sh_video->disp_w, sh_video->disp_h); | 1122 sh_video->disp_w, sh_video->disp_h); |
1123 } | |
1114 if (vo_spudec!=NULL) | 1124 if (vo_spudec!=NULL) |
1115 inited_flags|=INITED_SPUDEC; | 1125 inited_flags|=INITED_SPUDEC; |
1116 #endif | 1126 #endif |
1117 | 1127 |
1118 #ifdef USE_SUB | 1128 #ifdef USE_SUB |