From 48c301ddbcd5a1f4d396a3ccb8a8b00426f6b48b Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 13 Nov 2006 18:38:29 +0000
Subject: [PATCH] Move sh_sub_t to stheader.h, where all the other sh structs
 are defined

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20892 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libmpdemux/demuxer.h  | 14 --------------
 libmpdemux/stheader.h | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h
index 973887865b..49f3625e01 100644
--- a/libmpdemux/demuxer.h
+++ b/libmpdemux/demuxer.h
@@ -127,20 +127,6 @@ typedef struct demuxer_info_st {
   char *copyright;
 } demuxer_info_t;
 
-typedef struct {
-  int sid;
-  char type;                    // t = text, v = VobSub, a = SSA/ASS
-  int has_palette;              // If we have a valid palette
-  unsigned int palette[16];     // for VobSubs
-  int width, height;            // for VobSubs
-  int custom_colors;
-  unsigned int colors[4];
-  int forced_subs_only;
-#ifdef USE_ASS
-  ass_track_t* ass_track;  // for SSA/ASS streams (type == 'a')
-#endif
-} sh_sub_t;
-
 #define MAX_A_STREAMS 256
 #define MAX_V_STREAMS 256
 #define MAX_S_STREAMS 32
diff --git a/libmpdemux/stheader.h b/libmpdemux/stheader.h
index 43d0d32758..e4c1bac0c1 100644
--- a/libmpdemux/stheader.h
+++ b/libmpdemux/stheader.h
@@ -90,6 +90,20 @@ typedef struct {
   void* context;   // codec-specific stuff (usually HANDLE or struct pointer)
 } sh_video_t;
 
+typedef struct {
+  int sid;
+  char type;                    // t = text, v = VobSub, a = SSA/ASS
+  int has_palette;              // If we have a valid palette
+  unsigned int palette[16];     // for VobSubs
+  int width, height;            // for VobSubs
+  int custom_colors;
+  unsigned int colors[4];
+  int forced_subs_only;
+#ifdef USE_ASS
+  ass_track_t* ass_track;  // for SSA/ASS streams (type == 'a')
+#endif
+} sh_sub_t;
+
 // demuxer.c:
 #define new_sh_audio(d, i) new_sh_audio_aid(d, i, i)
 sh_audio_t* new_sh_audio_aid(demuxer_t *demuxer,int id,int aid);