Fill sh_sub_t.lang in lavf, mkv and ogg demuxers. Use it for printing subtitle

track language.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26116 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 2 insertions, 20 deletions

diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c
index c0ac842eca..2a124ba902 100644
--- a/libmpdemux/demux_mkv.c
+++ b/libmpdemux/demux_mkv.c
@@ -2241,6 +2241,8 @@ demux_mkv_open_sub (demuxer_t *demuxer, mkv_track_t *track, int sid)
       memcpy (sh->extradata, track->private_data,
               track->private_size);
       sh->extradata_len = track->private_size;
+      if (track->language && (strcmp(track->language, "und") != 0))
+        sh->lang = strdup(track->language);
     }
   else
     {
@@ -3484,26 +3486,6 @@ demux_mkv_control (demuxer_t *demuxer, int cmd, void *arg)
     }
 }
 
-/** \brief Get the language code for a subtitle track.
-
-  Retrieves the language code for a subtitle track if it is known.
-  If the language code is "und" then do not copy it ("und" = "undefined").
-
-  \param demuxer The demuxer to work on
-  \param track_num The subtitle track number to get the language from
-  \param lang Store the language here
-  \param maxlen The maximum number of characters to copy into lang
-*/
-void
-demux_mkv_get_sub_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 = demux_mkv_find_track_by_num (mkv_d, track_num, MATROSKA_TRACK_SUBTITLE);
-  if (track && track->language && strcmp(track->language, "und"))
-    av_strlcpy(lang, track->language, maxlen);
-}
-
 const demuxer_desc_t demuxer_desc_matroska = {
   "Matroska demuxer",
   "mkv",