diff options
author | ptt <ptt@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-10-12 14:11:39 +0000 |
---|---|---|
committer | ptt <ptt@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-10-12 14:11:39 +0000 |
commit | 07198ca3ae33b2cf0acb7ca6dcc7299cfd6f1da3 (patch) | |
tree | 11b343ca86d3fb80d0d851e13cdb1020be417374 | |
parent | a55d73eed03e5eaf4c0d7de6eac69b1c0b702237 (diff) | |
download | mpv-07198ca3ae33b2cf0acb7ca6dcc7299cfd6f1da3.tar.bz2 mpv-07198ca3ae33b2cf0acb7ca6dcc7299cfd6f1da3.tar.xz |
modifications pointed out by reimar doffinger
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20174 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | libmpdemux/demux_mkv.c | 22 | ||||
-rw-r--r-- | mplayer.c | 1 |
2 files changed, 6 insertions, 17 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index 4ebc707b1e..e9716b6e44 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -3969,23 +3969,11 @@ demux_mkv_get_audio_lang(demuxer_t *demuxer, int track_num, char *lang, int maxlen) { mkv_demuxer_t *mkv_d = (mkv_demuxer_t *) demuxer->priv; - mkv_track_t *track; - int i, num; - - num = 0; - for (i = 0; i < mkv_d->num_tracks; i++) - { - track = mkv_d->tracks[i]; - if (track->type == MATROSKA_TRACK_AUDIO) - num++; - if (num == (track_num + 1)) - { - if ((track->language != NULL) && - strcmp(track->language, "und")) - strlcpy(lang, track->language, maxlen); - return; - } - } + mkv_track_t *track = demux_mkv_find_track_by_num (mkv_d, track_num, MATROSKA_TRACK_AUDIO); + if ((track->language != NULL) && + strcmp(track->language, "und")) + strlcpy(lang, track->language, maxlen); + return; } @@ -1816,6 +1816,7 @@ static int mp_property_audio(m_option_t* prop,int action,void* arg) { if (code) { lang[0] = code >> 8; lang[1] = code; + lang[2] = 0; } snprintf(*(char**)arg, 63, "(%d) %s", audio_id, code ? lang : MSGTR_Unknown); return 1; |