From 3b92d754814e1e3db98192d6fbd29df1a73ed7ff Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 11 Jul 2010 09:03:13 +0000 Subject: mpcommon.c: Remove dvdsub_id checks that should not be necessary git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31692 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mpcommon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mpcommon.c') diff --git a/mpcommon.c b/mpcommon.c index b9f9c13ff6..b03248c937 100644 --- a/mpcommon.c +++ b/mpcommon.c @@ -135,7 +135,7 @@ void update_subtitles(struct MPContext *mpctx, struct MPOpts *opts, } // DVD sub: - if (vobsub_id >= 0 || (opts->sub_id >= 0 && type == 'v')) { + if (vobsub_id >= 0 || type == 'v') { int timestamp; current_module = "spudec"; /* Get a sub packet from the DVD or a vobsub */ @@ -178,7 +178,7 @@ void update_subtitles(struct MPContext *mpctx, struct MPOpts *opts, if (vo_vobsub || timestamp >= 0) spudec_assemble(vo_spudec, packet, len, timestamp); } - } else if (opts->sub_id >= 0 && (is_text_sub(type) || is_av_sub(type) || type == 'd')) { + } else if (is_text_sub(type) || is_av_sub(type) || type == 'd') { if (type == 'd' && !d_dvdsub->demuxer->teletext) { tt_stream_props tsp = {0}; void *ptr = &tsp; -- cgit v1.2.3