Mercurial > mplayer.hg

diff mpcommon.c @ 31626:8bb62807f3b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove dvdsub_id checks that should not be necessary.
author reimar
date Sun, 11 Jul 2010 09:03:13 +0000
parents ad007a37ae4e
children f15df2e3081b
line wrap: on
line diff
--- 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) {