mirror of https://github.com/mpv-player/mpv
dvd subtitles should be disabled by default, and enabled specifying -sid or -slang; this fix also restores the display of other subtitles types when dvd subs are present
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17380 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
0f32eccff7
commit
cb832df90c
|
@ -266,7 +266,7 @@ extern char *sub_demuxer_name; // override sub demuxer
|
||||||
// streaming:
|
// streaming:
|
||||||
int audio_id=-1;
|
int audio_id=-1;
|
||||||
int video_id=-1;
|
int video_id=-1;
|
||||||
int dvdsub_id=-1;
|
int dvdsub_id=-2;
|
||||||
int vobsub_id=-1;
|
int vobsub_id=-1;
|
||||||
char* audio_lang=NULL;
|
char* audio_lang=NULL;
|
||||||
char* dvdsub_lang=NULL;
|
char* dvdsub_lang=NULL;
|
||||||
|
@ -1945,6 +1945,7 @@ if(stream_dump_type==5){
|
||||||
if(stream->type==STREAMTYPE_DVD){
|
if(stream->type==STREAMTYPE_DVD){
|
||||||
current_module="dvd lang->id";
|
current_module="dvd lang->id";
|
||||||
if(audio_id==-1) audio_id=dvd_aid_from_lang(stream,audio_lang);
|
if(audio_id==-1) audio_id=dvd_aid_from_lang(stream,audio_lang);
|
||||||
|
if(dvdsub_lang && dvdsub_id==-2) dvdsub_id=-1;
|
||||||
if(dvdsub_lang && dvdsub_id==-1) dvdsub_id=dvd_sid_from_lang(stream,dvdsub_lang);
|
if(dvdsub_lang && dvdsub_id==-1) dvdsub_id=dvd_sid_from_lang(stream,dvdsub_lang);
|
||||||
// setup global sub numbering
|
// setup global sub numbering
|
||||||
global_sub_indices[SUB_SOURCE_DEMUX] = global_sub_size; // the global # of the first demux-specific sub.
|
global_sub_indices[SUB_SOURCE_DEMUX] = global_sub_size; // the global # of the first demux-specific sub.
|
||||||
|
|
Loading…
Reference in New Issue