# HG changeset patch
# User reimar
# Date 1278838993 0
# Node ID 8bb62807f3b84781d68fa16c85cb8ad138b52d6d
# Parent  7c76f46056c9174b9552c81b3fb516ce35ece11f
Remove dvdsub_id checks that should not be necessary.

diff -r 7c76f46056c9 -r 8bb62807f3b8 mpcommon.c
--- a/mpcommon.c	Sun Jul 11 08:02:26 2010 +0000
+++ b/mpcommon.c	Sun Jul 11 09:03:13 2010 +0000
@@ -131,7 +131,7 @@
 
     // DVD sub:
     if (vo_config_count &&
-        (vobsub_id >= 0 || (dvdsub_id >= 0 && type == 'v'))) {
+        (vobsub_id >= 0 || type == 'v')) {
         int timestamp;
         if (!vo_spudec)
             vo_spudec = spudec_new(NULL);
@@ -170,7 +170,7 @@
             if (vo_vobsub || timestamp >= 0)
                 spudec_assemble(vo_spudec, packet, len, timestamp);
         }
-    } else if (dvdsub_id >= 0 && (is_text_sub(type) || is_av_sub(type) || type == 'd')) {
+    } else if (is_text_sub(type) || is_av_sub(type) || type == 'd') {
         int orig_type = type;
         double endpts;
         if (type == 'd' && !d_dvdsub->demuxer->teletext) {