summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-08-16 10:33:33 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-02 04:15:48 +0200
commitb7d40eab7d07bc0d2a0e31a0093d450f88837163 (patch)
treeb518771421f6e19a90665ab50ffb7483ebb2cdb0
parent55a7d7fb2b4bd07e3b471f32f5da707313060fe5 (diff)
downloadmpv-b7d40eab7d07bc0d2a0e31a0093d450f88837163.tar.bz2
mpv-b7d40eab7d07bc0d2a0e31a0093d450f88837163.tar.xz
core: Do not call *_aid_from_lang when audio_lang is NULL
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31963 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--mplayer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mplayer.c b/mplayer.c
index 97135e8805..ce88e3a8c2 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -3703,7 +3703,7 @@ if(stream_dump_type==5){
#ifdef CONFIG_DVDREAD
if(mpctx->stream->type==STREAMTYPE_DVD){
current_module="dvd lang->id";
- if(opts->audio_id==-1) opts->audio_id=dvd_aid_from_lang(mpctx->stream,opts->audio_lang);
+ if(opts->audio_lang && opts->audio_id==-1) opts->audio_id=dvd_aid_from_lang(mpctx->stream,opts->audio_lang);
if(opts->sub_lang && opts->sub_id==-1) opts->sub_id=dvd_sid_from_lang(mpctx->stream,opts->sub_lang);
// setup global sub numbering
mpctx->sub_counts[SUB_SOURCE_DEMUX] = dvd_number_of_subs(mpctx->stream);
@@ -3714,7 +3714,7 @@ if(mpctx->stream->type==STREAMTYPE_DVD){
#ifdef CONFIG_DVDNAV
if(mpctx->stream->type==STREAMTYPE_DVDNAV){
current_module="dvdnav lang->id";
- if(opts->audio_id==-1) opts->audio_id=mp_dvdnav_aid_from_lang(mpctx->stream,opts->audio_lang);
+ if(opts->audio_lang && opts->audio_id==-1) opts->audio_id=mp_dvdnav_aid_from_lang(mpctx->stream,opts->audio_lang);
dvdsub_lang_id = -3;
if(opts->sub_lang && opts->sub_id==-1)
dvdsub_lang_id = opts->sub_id = mp_dvdnav_sid_from_lang(mpctx->stream,opts->sub_lang);