summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authormosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-08-24 21:37:41 +0000
committermosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-08-24 21:37:41 +0000
commit51fe7e4a6a26119d975b3a84b6e8e5f4e9d636bd (patch)
treeb519e3561d6336a9d394b51468da2955e1fb9e99 /mplayer.c
parent36f2212fe22eef76852133ba3ed65235b97f8d3f (diff)
downloadmpv-51fe7e4a6a26119d975b3a84b6e8e5f4e9d636bd.tar.bz2
mpv-51fe7e4a6a26119d975b3a84b6e8e5f4e9d636bd.tar.xz
Display the language code for subtitles from Matroska files.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13130 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/mplayer.c b/mplayer.c
index ef7d118489..b088287383 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -3641,7 +3641,7 @@ if(rel_seek_secs || abs_seek_pos){
snprintf(osd_text_tmp, 63, "Subtitles: (%d)", dvdsub_id);
}
#ifdef USE_DVDREAD
- if (vo_spudec) {
+ if (vo_spudec && (demuxer->type != DEMUXER_TYPE_MATROSKA)) {
char lang[5] = "none";
int code = 0;
if (dvdsub_id >= 0) code = dvd_lang_from_sid(stream, dvdsub_id);
@@ -3653,6 +3653,17 @@ if(rel_seek_secs || abs_seek_pos){
snprintf(osd_text_tmp, 63, "Subtitles: (%d) %s", dvdsub_id, lang);
}
#endif
+#ifdef HAVE_MATROSKA
+ if (demuxer->type == DEMUXER_TYPE_MATROSKA) {
+ char lang[10] = "unknown";
+ if (dvdsub_id >= 0) {
+ demux_mkv_get_sub_lang(demuxer, dvdsub_id, lang, 9);
+ lang[9] = 0;
+ } else
+ strcpy(lang, "off");
+ snprintf(osd_text_tmp, 63, "Subtitles: (%d) %s", dvdsub_id, lang);
+ }
+#endif
osd_show_vobsub_changed--;
} else
#ifdef USE_SUB