X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_block_helper.h;h=376c2b4d751d861a3cb33324834fb37e324a4eab;hb=3f7d9fb446c6e14c261d85ac8f93501014fd645e;hp=8500b0c07689776fc318c0fcd67234f30b1eb371;hpb=079a1818dc58b9dc81ca92b5217da2a8d599572f;p=vlc diff --git a/include/vlc_block_helper.h b/include/vlc_block_helper.h index 8500b0c076..376c2b4d75 100644 --- a/include/vlc_block_helper.h +++ b/include/vlc_block_helper.h @@ -21,12 +21,8 @@ * 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_BLOCK_HELPER_H -#define _VLC_BLOCK_HELPER_H 1 +#ifndef VLC_BLOCK_HELPER_H +#define VLC_BLOCK_HELPER_H 1 #include @@ -91,6 +87,7 @@ static inline void block_BytestreamPush( block_bytestream_t *p_bytestream, if( !p_bytestream->p_block ) p_bytestream->p_block = p_block; } +LIBVLC_USED static inline block_t *block_BytestreamPop( block_bytestream_t *p_bytestream ) { block_t *p_block; @@ -442,7 +439,7 @@ static inline int block_PeekOffsetBytes( block_bytestream_t *p_bytestream, static inline int block_FindStartcodeFromOffset( block_bytestream_t *p_bytestream, size_t *pi_offset, - uint8_t *p_startcode, int i_startcode_length ) + const uint8_t *p_startcode, int i_startcode_length ) { block_t *p_block, *p_block_backup = 0; int i_size = 0;