diff libmpdemux/demux_lavf.c @ 26084:ec5749eb6f5f

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

--- a/libmpdemux/demux_lavf.c	Fri Feb 29 17:25:37 2008 +0000
+++ b/libmpdemux/demux_lavf.c	Fri Feb 29 17:25:39 2008 +0000
@@ -431,6 +431,8 @@
                 memcpy(sh_sub->extradata, codec->extradata, codec->extradata_size);
                 sh_sub->extradata_len = codec->extradata_size;
             }
+            if (st->language)
+              sh_sub->lang = strdup(st->language);
             if (demuxer->sub->id == -1
                 || (demuxer->sub->id == -2 && (dvdsub_lang && st->language[0] && !strncmp(dvdsub_lang, st->language, 3)))
                 || demuxer->sub->id == priv->sub_streams) {
@@ -791,19 +793,6 @@
     }
 }
 
-/** \brief Get the language code for a subtitle track.
-
-  Retrieves the language code for a subtitle track.
-
-  \param demuxer The demuxer to work on
-  \param track_num The subtitle track number to get the language from
-*/
-char *demux_lavf_sub_lang(demuxer_t *demuxer, int track_num)
-{
-    lavf_priv_t *priv = demuxer->priv;
-    return priv->avfc->streams[priv->sstreams[track_num]]->language;
-}
-
 static void demux_close_lavf(demuxer_t *demuxer)
 {
     lavf_priv_t* priv = demuxer->priv;