diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-21 23:57:29 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-22 10:11:15 +0300 |
| commit | b3a688d45ff463592c73c425d68532f8f9b7880d (patch) | |
| tree | 92b21c9ceb01b999053c9dd7fce5cf1662f495e1 /libmpdemux/demux_ogg.c | |
| parent | de5566f0b5420fbdbf0dc37f225be01cfd04cf66 (diff) | |
| download | mpv-b3a688d45ff463592c73c425d68532f8f9b7880d.tar.bz2 mpv-b3a688d45ff463592c73c425d68532f8f9b7880d.tar.xz | |
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.
Diffstat (limited to 'libmpdemux/demux_ogg.c')
| -rw-r--r-- | libmpdemux/demux_ogg.c | 5 |
1 files changed, 2 insertions, 3 deletions
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, |