Mercurial > mplayer.hg

diff command.c @ 23549:439dafcb16a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge (trivial) dvdnav and dvdread subtitle selection code
author reimar
date Sun, 17 Jun 2007 08:29:26 +0000
parents ac72a4e46c45
children 519e42b716aa
line wrap: on
line diff
--- a/command.c	Sun Jun 17 08:26:07 2007 +0000
+++ b/command.c	Sun Jun 17 08:29:26 2007 +0000
@@ -1243,17 +1243,6 @@
 	dvdsub_id =
 	    mpctx->global_sub_pos - mpctx->global_sub_indices[SUB_SOURCE_DEMUX];
 	if (d_sub) {
-#ifdef USE_DVDREAD
-	    if (vo_spudec && mpctx->stream->type == STREAMTYPE_DVD) {
-		d_sub->id = dvdsub_id;
-	    }
-#endif
-
-#ifdef USE_DVDNAV
-	    if (vo_spudec && mpctx->stream->type == STREAMTYPE_DVDNAV) {
-		d_sub->id = dvdsub_id;
-	    }
-#endif
 	    if (mpctx->stream->type != STREAMTYPE_DVD
 		&& mpctx->stream->type != STREAMTYPE_DVDNAV) {
 		int i = 0;
@@ -1268,6 +1257,8 @@
 		    }
 		}
 	    }
+	    else if (vo_spudec)
+		d_sub->id = dvdsub_id;
 	    if (mpctx->demuxer->type == DEMUXER_TYPE_MATROSKA)
 		d_sub->id = demux_mkv_change_subs(mpctx->demuxer, dvdsub_id);
 	    if (d_sub->sh && d_sub->id >= 0) {