4 files changed, 2 insertions, 12 deletions
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c
index ba898d10e4..79b71a1b9b 100644
--- a/libmpdemux/demux_lavf.c
+++ b/libmpdemux/demux_lavf.c
@@ -42,9 +42,6 @@
 
 #define PROBE_BUF_SIZE 2048
 
-extern char *audio_lang;
-extern char *dvdsub_lang;
-extern int dvdsub_id;
 static unsigned int opt_probesize = 0;
 static unsigned int opt_analyzeduration = 0;
 static char *opt_format;
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c
index 59db246caa..72d68c98ac 100644
--- a/libmpdemux/demux_mkv.c
+++ b/libmpdemux/demux_mkv.c
@@ -181,11 +181,6 @@ typedef struct mkv_demuxer
 #define RAPROPERTIES4_SIZE 56
 #define RAPROPERTIES5_SIZE 70
 
-/* for e.g. "-slang ger" */
-extern char *dvdsub_lang;
-extern char *audio_lang;
-extern int dvdsub_id;
-
 /**
  * \brief ensures there is space for at least one additional element
  * \param array array to grow
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
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 377b34fd08..4ccd7962df 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -234,8 +234,6 @@ demuxer_t *new_demuxer(struct MPOpts *opts, stream_t *stream, int type,
     return d;
 }
 
-extern int dvdsub_id;
-
 sh_sub_t *new_sh_sub_sid(demuxer_t *demuxer, int id, int sid)
 {
     if (id > MAX_S_STREAMS - 1 || id < 0) {