Mercurial > mplayer.hg

comparison mplayer.c @ 31882:ef30e1505969

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Do not call *_aid_from_lang when audio_lang is NULL.
author reimar
date Mon, 16 Aug 2010 10:33:33 +0000
parents e30fe0cb79cd
children 4ed75340d779
comparison
equal deleted inserted replaced
31881:238e9d01501f 31882:ef30e1505969
3343 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CoreDumped); 3343 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CoreDumped);
3344 exit_player_with_rc(EXIT_EOF, 0); 3344 exit_player_with_rc(EXIT_EOF, 0);
3345 } 3345 }
3346 3346
3347 if(mpctx->stream->type==STREAMTYPE_BD){ 3347 if(mpctx->stream->type==STREAMTYPE_BD){
3348 if(audio_id==-1) audio_id=bd_aid_from_lang(mpctx->stream,audio_lang); 3348 if(audio_lang && audio_id==-1) audio_id=bd_aid_from_lang(mpctx->stream,audio_lang);
3349 if(dvdsub_lang && dvdsub_id==-1) dvdsub_id=bd_sid_from_lang(mpctx->stream,dvdsub_lang); 3349 if(dvdsub_lang && dvdsub_id==-1) dvdsub_id=bd_sid_from_lang(mpctx->stream,dvdsub_lang);
3350 } 3350 }
3351 3351
3352 #ifdef CONFIG_DVDREAD 3352 #ifdef CONFIG_DVDREAD
3353 if(mpctx->stream->type==STREAMTYPE_DVD){ 3353 if(mpctx->stream->type==STREAMTYPE_DVD){
3354 current_module="dvd lang->id"; 3354 current_module="dvd lang->id";
3355 if(audio_id==-1) audio_id=dvd_aid_from_lang(mpctx->stream,audio_lang); 3355 if(audio_lang && audio_id==-1) audio_id=dvd_aid_from_lang(mpctx->stream,audio_lang);
3356 if(dvdsub_lang && dvdsub_id==-1) dvdsub_id=dvd_sid_from_lang(mpctx->stream,dvdsub_lang); 3356 if(dvdsub_lang && dvdsub_id==-1) dvdsub_id=dvd_sid_from_lang(mpctx->stream,dvdsub_lang);
3357 // setup global sub numbering 3357 // setup global sub numbering
3358 mpctx->sub_counts[SUB_SOURCE_DEMUX] = dvd_number_of_subs(mpctx->stream); 3358 mpctx->sub_counts[SUB_SOURCE_DEMUX] = dvd_number_of_subs(mpctx->stream);
3359 current_module=NULL; 3359 current_module=NULL;
3360 } 3360 }
3361 #endif 3361 #endif
3362 3362
3363 #ifdef CONFIG_DVDNAV 3363 #ifdef CONFIG_DVDNAV
3364 if(mpctx->stream->type==STREAMTYPE_DVDNAV){ 3364 if(mpctx->stream->type==STREAMTYPE_DVDNAV){
3365 current_module="dvdnav lang->id"; 3365 current_module="dvdnav lang->id";
3366 if(audio_id==-1) audio_id=mp_dvdnav_aid_from_lang(mpctx->stream,audio_lang); 3366 if(audio_lang && audio_id==-1) audio_id=mp_dvdnav_aid_from_lang(mpctx->stream,audio_lang);
3367 dvdsub_lang_id = -3; 3367 dvdsub_lang_id = -3;
3368 if(dvdsub_lang && dvdsub_id==-1) 3368 if(dvdsub_lang && dvdsub_id==-1)
3369 dvdsub_lang_id=dvdsub_id=mp_dvdnav_sid_from_lang(mpctx->stream,dvdsub_lang); 3369 dvdsub_lang_id=dvdsub_id=mp_dvdnav_sid_from_lang(mpctx->stream,dvdsub_lang);
3370 // setup global sub numbering 3370 // setup global sub numbering
3371 mpctx->sub_counts[SUB_SOURCE_DEMUX] = mp_dvdnav_number_of_subs(mpctx->stream); 3371 mpctx->sub_counts[SUB_SOURCE_DEMUX] = mp_dvdnav_number_of_subs(mpctx->stream);