X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_stream.h;h=6f02e8b5cbb436620f9be7120519029b3b4f8a6b;hb=066e58dd3454554fed6dad53fd2513736087720d;hp=db7467bf8d72ab50bcb16e50777c14793e3ba527;hpb=a5e04c86eb59fa61e29cd22ef2cc99800b2aa259;p=vlc diff --git a/include/vlc_stream.h b/include/vlc_stream.h index db7467bf8d..6f02e8b5cb 100644 --- a/include/vlc_stream.h +++ b/include/vlc_stream.h @@ -1,5 +1,5 @@ /***************************************************************************** - * vlc_stream.h + * vlc_stream.h: Stream (between access and demux) descriptor and methods ***************************************************************************** * Copyright (C) 1999-2004 the VideoLAN team * $Id$ @@ -18,12 +18,18 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * 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 + # 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 ) );