MKV USF subtitles support and other Subtitles improvements.

[vlc] / include / vlc_stream.h

diff --git a/include/vlc_stream.h b/include/vlc_stream.h
index 3b4ff21827f5f698758cc6f1cad658cabc724ec0..6f02e8b5cbb436620f9be7120519029b3b4f8a6b 100644 (file)
--- a/include/vlc_stream.h
+++ b/include/vlc_stream.h
@@ -21,9 +21,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#if !defined( __LIBVLC__ )
+  #error You are not libvlc or one of its plugins. You cannot include this file
+#endif
+
 #ifndef _VLC_STREAM_H
 #define _VLC_STREAM_H 1
 
+#include <vlc_block.h>
+
 # ifdef __cplusplus
 extern "C" {
 # endif
@@ -203,7 +209,7 @@ VLC_EXPORT( char *, stream_ReadLine, ( stream_t * ) );
  * Create a special stream and a demuxer, this allows chaining demuxers
  */
 #define stream_DemuxNew( a, b, c ) __stream_DemuxNew( VLC_OBJECT(a), b, c)
-VLC_EXPORT( stream_t *,__stream_DemuxNew, ( vlc_object_t *p_obj, char *psz_demux, es_out_t *out ) );
+VLC_EXPORT( stream_t *,__stream_DemuxNew, ( vlc_object_t *p_obj, const char *psz_demux, es_out_t *out ) );
 VLC_EXPORT( void,      stream_DemuxSend,  ( stream_t *s, block_t *p_block ) );
 VLC_EXPORT( void,      stream_DemuxDelete,( stream_t *s ) );