From 7924781b04c2ac48248d3fc860f53e1b867a8396 Mon Sep 17 00:00:00 2001 From: reimar Date: Wed, 24 Jun 2009 08:13:52 +0000 Subject: AVStream.language is deprecated, switch to av_get_metadata instead. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29386 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_lavf.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 31715b159e..800e7eb3f2 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -220,6 +220,7 @@ static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) { lavf_priv_t *priv= demuxer->priv; AVStream *st= avfc->streams[i]; AVCodecContext *codec= st->codec; + AVMetadataTag *lang = av_metadata_get(st->metadata, "language", NULL, 0); int g; switch(codec->codec_type){ @@ -290,8 +291,8 @@ static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) { sh_audio->format = 0x7; break; } - if (st->language) { - sh_audio->lang = strdup(st->language); + if (lang && lang->value) { + sh_audio->lang = strdup(lang->value); mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AID_%d_LANG=%s\n", i, sh_audio->lang); } if (st->disposition & AV_DISPOSITION_DEFAULT) @@ -396,8 +397,8 @@ static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) { 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 (lang && lang->value) { + sh_sub->lang = strdup(lang->value); mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SID_%d_LANG=%s\n", priv->sub_streams, sh_sub->lang); } if (st->disposition & AV_DISPOSITION_DEFAULT) -- cgit v1.2.3