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/stheader.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'demux/stheader.h')

diff --git a/demux/stheader.h b/demux/stheader.h
index 433b2a934a..bf9077ea0a 100644
--- a/demux/stheader.h
+++ b/demux/stheader.h
@@ -63,6 +63,7 @@ struct sh_stream {
     int lavf_codec_tag;
 
     char *title;
+    char *lang;                 // language code
     bool default_track;         // container default track flag
     bool attached_picture;      // stream is a picture (such as album art)
 
@@ -93,7 +94,6 @@ struct sh_stream {
     double pts;                                                         \
     /* decoder context */                                               \
     void *context;                                                      \
-    char *lang;   /* track language */                                  \
 
 typedef struct sh_common {
     SH_COMMON
-- 
cgit v1.2.3