diff options
| author | eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-02-29 17:25:52 +0000 |
|---|---|---|
| committer | eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-02-29 17:25:52 +0000 |
| commit | 439cfd5d9e15ad2fa15ae3d8888fb7b82369bec8 (patch) | |
| tree | 33a7370acb164f5c910b6e10fc0f06aecc1c4e50 /libmpdemux | |
| parent | 22465e56cc97476636edd72c7d23f0c5cc692277 (diff) | |
| download | mpv-439cfd5d9e15ad2fa15ae3d8888fb7b82369bec8.tar.bz2 mpv-439cfd5d9e15ad2fa15ae3d8888fb7b82369bec8.tar.xz | |
Don't select audio stream in lavf and mkv demuxers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26123 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_lavf.c | 4 | ||||
| -rw-r--r-- | libmpdemux/demux_mkv.c | 12 |
2 files changed, 3 insertions, 13 deletions
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 01d505ca9b..123d8d0dcd 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -338,8 +338,8 @@ static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) { if (st->language) sh_audio->lang = strdup(st->language); if(mp_msg_test(MSGT_HEADER,MSGL_V) ) print_wave_header(sh_audio->wf, MSGL_V); - if((audio_lang && st->language[0] && !strncmp(audio_lang, st->language, 3)) - || (demuxer->audio->id == i || demuxer->audio->id == -1)) { + // select the first audio stream + if (!demuxer->audio->sh) { demuxer->audio->id = i; demuxer->audio->sh= demuxer->a_streams[i]; } else diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index 6363f7bc26..b6cb64de98 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -2418,14 +2418,7 @@ demux_mkv_open (demuxer_t *demuxer) /* select audio track */ track = NULL; - if (demuxer->audio->id == -1) /* automatically select an audio track */ - { - /* check if the user specified an audio language */ - if (audio_lang != NULL) - track = demux_mkv_find_track_by_language(mkv_d, audio_lang, - MATROSKA_TRACK_AUDIO); if (track == NULL) - /* no audio language specified, or language not found */ /* search for an audio track that has the 'default' flag set */ for (i=0; i < mkv_d->num_tracks; i++) if (mkv_d->tracks[i]->type == MATROSKA_TRACK_AUDIO @@ -2444,10 +2437,7 @@ demux_mkv_open (demuxer_t *demuxer) track = mkv_d->tracks[i]; break; } - } - else if (demuxer->audio->id != -2) /* -2 = no audio at all */ - track = demux_mkv_find_track_by_num (mkv_d, demuxer->audio->id, - MATROSKA_TRACK_AUDIO); + if (track && demuxer->a_streams[track->tnum]) { demuxer->audio->id = track->tnum; |