Merge svn changes up to r29912

1 files changed, 5 insertions, 0 deletions

diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h
index deb3732c5b..44cd642ed3 100644
--- a/libmpdemux/demuxer.h
+++ b/libmpdemux/demuxer.h
@@ -144,6 +144,8 @@ typedef struct demux_stream {
   off_t dpos;                // position in the demuxed stream
   int pack_no;		   // serial number of packet
   int flags;               // flags of current packet (keyframe etc)
+  int non_interleaved;     // 1 if this stream is not properly interleaved,
+                           // so e.g. subtitle handling must do explicit reads.
 //---------------
   int packs;              // number of packets in buffer
   int bytes;              // total bytes of packets in buffer
@@ -255,6 +257,9 @@ typedef struct demuxer {
   struct sh_video *v_streams[MAX_V_STREAMS];
   struct sh_sub   *s_streams[MAX_S_STREAMS];
 
+  // pointer to teletext decoder private data, if demuxer stream contains teletext
+  void *teletext;
+
   demux_chapter_t* chapters;
   int num_chapters;