Mercurial > mplayer.hg

comparison mplayer.c @ 27805:92f83263b154

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Avoid calling init_vo_spudec() too early. (before mpctx->d_sub->sh initialization)
author aurel
date Mon, 27 Oct 2008 22:34:33 +0000
parents 48c1ae64255b
children 3ac3d3a51934
comparison
equal deleted inserted replaced
27804:bacaca1ac820 27805:92f83263b154
3431 /* display clip info */ 3431 /* display clip info */
3432 demux_info_print(mpctx->demuxer); 3432 demux_info_print(mpctx->demuxer);
3433 3433
3434 //================== Read SUBTITLES (DVD & TEXT) ========================== 3434 //================== Read SUBTITLES (DVD & TEXT) ==========================
3435 if(vo_spudec==NULL && mpctx->sh_video && 3435 if(vo_spudec==NULL && mpctx->sh_video &&
3436 (mpctx->stream->type==STREAMTYPE_DVD || mpctx->stream->type == STREAMTYPE_DVDNAV || mpctx->d_sub->id >= 0)){ 3436 (mpctx->stream->type==STREAMTYPE_DVD || mpctx->stream->type == STREAMTYPE_DVDNAV)){
3437 init_vo_spudec(); 3437 init_vo_spudec();
3438 } 3438 }
3439 3439
3440 // Apply current settings for forced subs 3440 // Apply current settings for forced subs
3441 if (vo_spudec!=NULL) 3441 if (vo_spudec!=NULL)