Mercurial > mplayer.hg

changeset 30506:a70589785d97

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move the check for valid sh_video into the init_vo_spudec, this fixes a crash when command.c calls this function without having to duplicate the check.
author reimar
date Sat, 13 Feb 2010 11:38:36 +0000
parents 580319e640b3
children cc83ac4f71af
files mplayer.c
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mplayer.c	Fri Feb 12 20:38:29 2010 +0000
+++ b/mplayer.c	Sat Feb 13 11:38:36 2010 +0000
@@ -1138,6 +1138,11 @@
     spudec_free(vo_spudec);
   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";
@@ -3514,7 +3519,7 @@
 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();
 }