diff options
Diffstat (limited to 'libmpdemux/demux_ogg.c')
| -rw-r--r-- | libmpdemux/demux_ogg.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index 58876c6522..4234eb9498 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -25,12 +25,12 @@ #include <math.h> #include <inttypes.h> +#include "options.h" #include "mp_msg.h" -#include "help_mp.h" #include "stream/stream.h" #include "demuxer.h" #include "stheader.h" -#include "libavutil/intreadwrite.h" +#include "ffmpeg_files/intreadwrite.h" #include "aviprint.h" #include "demux_mov.h" #include "demux_ogg.h" @@ -163,9 +163,6 @@ typedef struct ogg_demuxer { #define PACKET_LEN_BITS2 0x02 #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... @@ -450,9 +447,10 @@ 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; - 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); @@ -1309,6 +1307,7 @@ static int demux_ogg_fill_buffer(demuxer_t *d, demux_stream_t *dsds) // stream, then we join the avi and ogg demuxer with a demuxers demuxer demuxer_t *init_avi_with_ogg(demuxer_t *demuxer) { + struct MPOpts *opts = demuxer->opts; demuxer_t *od; ogg_demuxer_t *ogg_d; stream_t *s; @@ -1375,7 +1374,7 @@ demuxer_t *init_avi_with_ogg(demuxer_t *demuxer) // Create the ds_stream and the ogg demuxer s = new_ds_stream(demuxer->audio); - od = new_demuxer(s, DEMUXER_TYPE_OGG, 0, -2, -2, NULL); + od = new_demuxer(opts, s, DEMUXER_TYPE_OGG, 0, -2, -2, NULL); /// Add the header packets in the ogg demuxer audio stream for (i = 0; i < 3; i++) { |