From a0987186b91680df473a7273a1eec130d0dd1a60 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sat, 9 Feb 2013 15:15:28 +0100
Subject: demux_lavf: remove code duplication

Also move the lang field into the general stream header. (SH_COMMON is
an old hack to "share" code between audio/video/sub headers.)

There should be no functional changes, other than not printing stream
info in verbose mode or with slave mode. (The frontend already prints
stream info, and this is just a leftover when individual demuxers did
this, and slave mode remains broken.)
---
 demux/demux.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'demux/demux.c')

diff --git a/demux/demux.c b/demux/demux.c
index 32ef281f8c..2ebd79b863 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -361,7 +361,7 @@ struct sh_sub *new_sh_sub_sid_lang(struct demuxer *demuxer, int id, int sid,
 {
     struct sh_sub *sh = new_sh_sub_sid(demuxer, id, sid);
     if (lang && lang[0] && strcmp(lang, "und")) {
-        sh->lang = talloc_strdup(sh, lang);
+        sh->gsh->lang = talloc_strdup(sh, lang);
         mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SID_%d_LANG=%s\n", sid, lang);
     }
     return sh;
-- 
cgit v1.2.3