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.

1 files changed, 1 insertions, 0 deletions

diff --git a/defaultopts.c b/defaultopts.c
index 029584c0c8..08e954db39 100644
--- a/defaultopts.c
+++ b/defaultopts.c
@@ -12,6 +12,7 @@ void set_default_mplayer_options(struct MPOpts *opts)
         .user_correct_pts = -1,
         .audio_id = -1,
         .video_id = -1,
+        .sub_id = -2,
         .playback_speed = 1.,
     };
 }