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_mpg.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_mpg.c')
| -rw-r--r-- | libmpdemux/demux_mpg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpdemux/demux_mpg.c b/libmpdemux/demux_mpg.c index 5801e5f1fd..ddc5d218dd 100644 --- a/libmpdemux/demux_mpg.c +++ b/libmpdemux/demux_mpg.c @@ -26,6 +26,7 @@ #include "config.h" #include "mp_msg.h" +#include "options.h" #include "stream/stream.h" #include "demuxer.h" @@ -57,7 +58,6 @@ typedef struct mpg_demuxer { int a_stream_ids[MAX_A_STREAMS]; } mpg_demuxer_t; -extern char* dvdsub_lang; static int mpeg_pts_error=0; off_t ps_probe = 0; @@ -482,7 +482,7 @@ static int demux_mpg_read_packet(demuxer_t *demux,int id){ if(demux->sub->id > -1) demux->sub->id &= 0x1F; - if(!dvdsub_lang && demux->sub->id == -1) + if(!demux->opts->sub_lang && demux->sub->id == -1) demux->sub->id = aid; if(demux->sub->id==aid){ ds=demux->sub; |