diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-23 07:41:17 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-23 13:48:38 +0300 |
| commit | 66bd120a3a8c15ee3bd7ce41e7258e8b33925864 (patch) | |
| tree | 933be87b7812acd3f93dd17669857ab5d7c1302c /libmpdemux/demux_ogg.c | |
| parent | c0c914effd94324362e4ca70204f1b08783f6121 (diff) | |
| download | mpv-66bd120a3a8c15ee3bd7ce41e7258e8b33925864.tar.bz2 mpv-66bd120a3a8c15ee3bd7ce41e7258e8b33925864.tar.xz | |
Move dvdsub_id to options struct
Name the field "sub_id" as it's not specific to DVD subs.
Remove some other unused extern declarations together with dvdsub_id
from demux_mkv.c and demux_lavf.c.
Diffstat (limited to 'libmpdemux/demux_ogg.c')
| -rw-r--r-- | libmpdemux/demux_ogg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index 6b8eddf41f..3950c2be7e 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -8,6 +8,7 @@ #include <math.h> #include <inttypes.h> +#include "options.h" #include "mp_msg.h" #include "help_mp.h" #include "stream/stream.h" @@ -145,7 +146,6 @@ typedef struct ogg_demuxer { #define PACKET_IS_SYNCPOINT 0x08 extern char *dvdsub_lang, *audio_lang; -extern int dvdsub_id; //-------- subtitle support - should be moved to decoder layer, and queue // - subtitles up in demuxer buffer... @@ -395,7 +395,7 @@ static void demux_ogg_check_comments(demuxer_t *d, ogg_stream_t *os, int id, vor if (os->text && d->sub->id < 0 && demux_ogg_check_lang(val, dvdsub_lang)) { d->sub->id = index; - dvdsub_id = index; + d->opts->sub_id = index; mp_msg(MSGT_DEMUX, MSGL_V, "Ogg demuxer: Displaying subtitle stream id %d which matched -slang %s\n", id, val); } else |