mkv.cpp: read the new KaxSimpleBlock element (when libmatroska 0.8.0 is used)

[vlc] / include / stream_output.h

diff --git a/include/stream_output.h b/include/stream_output.h
index 72a863f8bbf1de322f3e2e9b9fff9dcfa3a50672..26a76b7c2c0b438427f0c72ce1ac5e7b365a6c93 100644 (file)
--- a/include/stream_output.h
+++ b/include/stream_output.h
@@ -1,12 +1,13 @@
 /*****************************************************************************
  * stream_output.h : stream output module
  *****************************************************************************
- * Copyright (C) 2002 the VideoLAN team
+ * Copyright (C) 2002-2005 the VideoLAN team
  * $Id$
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Laurent Aimar <fenrir@via.ecp.fr>
  *          Eric Petit <titer@videolan.org>
+ *          Jean-Paul Saman <jpsaman #_at_# m2x.nl>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -206,6 +207,9 @@ struct sout_stream_t
     sout_cfg_t        *p_cfg;
     char              *psz_next;
 
+    /* Subpicture unit */
+    spu_t             *p_spu;
+    
     /* add, remove a stream */
     sout_stream_id_t *(*pf_add)( sout_stream_t *, es_format_t * );
     int               (*pf_del)( sout_stream_t *, sout_stream_id_t * );
@@ -257,9 +261,6 @@ struct session_descriptor_t
 struct announce_method_t
 {
     int i_type;
-
-    /* For SAP */
-    char *psz_address; /* If we use a custom address */
 };
 
 
@@ -291,11 +292,10 @@ struct sap_handler_t
 
     int i_current_session;
 
-    int (*pf_add)  ( sap_handler_t*, session_descriptor_t *,announce_method_t*);
+    int (*pf_add)  ( sap_handler_t*, session_descriptor_t *);
     int (*pf_del)  ( sap_handler_t*, session_descriptor_t *);
 
     /* private data, not in p_sys as there is one kind of sap_handler_t */
-    vlc_iconv_t iconvHandle;
 };
 
 /* The main announce handler object */