diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 23:03:14 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 23:03:14 +0200 |
| commit | 36e7a20e695b376287310d602b44d6719f82a021 (patch) | |
| tree | 75070d702043e875c947fccaa2de7a419331de22 /mplayer.c | |
| parent | 70fb003a9f2d9dc764e320f3ca64b0af1c68fdfb (diff) | |
| parent | 93abb4f09229730c30e5bbdd6c54d4b981995eee (diff) | |
| download | mpv-36e7a20e695b376287310d602b44d6719f82a021.tar.bz2 mpv-36e7a20e695b376287310d602b44d6719f82a021.tar.xz | |
Merge svn changes up to r30550
Diffstat (limited to 'mplayer.c')
| -rw-r--r-- | mplayer.c | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -1158,6 +1158,11 @@ void init_vo_spudec(struct MPContext *mpctx) spudec_free(vo_spudec); mpctx->initialized_flags &= ~INITIALIZED_SPUDEC; vo_spudec = NULL; + + // we currently can't work without video stream + if (!mpctx->sh_video) + return; + if (spudec_ifo) { unsigned int palette[16], width, height; current_module="spudec_init_vobsub"; @@ -3848,7 +3853,7 @@ if(!mpctx->sh_video && !mpctx->sh_audio){ demux_info_print(mpctx->demuxer); //================== Read SUBTITLES (DVD & TEXT) ========================== -if(vo_spudec==NULL && mpctx->sh_video && +if(vo_spudec==NULL && (mpctx->stream->type==STREAMTYPE_DVD || mpctx->stream->type == STREAMTYPE_DVDNAV)){ init_vo_spudec(mpctx); } |