From b3a688d45ff463592c73c425d68532f8f9b7880d Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Fri, 21 May 2010 23:57:29 +0300 Subject: options: move -alang and -slang to option struct The option field corresponding to -slang is now called "sub_lang" instead of the old misleading global name "dvdsub_lang". The code handling -slang in subreader.c looks rather broken; disable it instead of converting it to use the option field. --- libmpdemux/demux_ogg.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'libmpdemux/demux_ogg.c') diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index e872ad5156..4234eb9498 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -163,8 +163,6 @@ typedef struct ogg_demuxer { #define PACKET_LEN_BITS2 0x02 #define PACKET_IS_SYNCPOINT 0x08 -extern char *dvdsub_lang, *audio_lang; - //-------- subtitle support - should be moved to decoder layer, and queue // - subtitles up in demuxer buffer... @@ -449,7 +447,8 @@ static void demux_ogg_check_comments(demuxer_t *d, ogg_stream_t *os, sh->lang = strdup(val); } // check for -slang if subs are uninitialized yet - if (os->text && d->sub->id < 0 && demux_ogg_check_lang(val, dvdsub_lang)) { + if (os->text && d->sub->id < 0 + && demux_ogg_check_lang(val, d->opts->sub_lang)) { d->sub->id = index; d->opts->sub_id = index; mp_msg(MSGT_DEMUX, MSGL_V, -- cgit v1.2.3