A bit of vlc/libvlc cleanup:

[vlc] / include / vlc_block_helper.h

diff --git a/include/vlc_block_helper.h b/include/vlc_block_helper.h
index f22f7fcf4434184738502a443fa499568505064b..35652e982498ed437e62e5027a4e118ee2908343 100644 (file)
--- a/include/vlc_block_helper.h
+++ b/include/vlc_block_helper.h
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * vlc_block_helper.h: Helper functions for data blocks management.
  *****************************************************************************
- * Copyright (C) 2003 VideoLAN
- * $Id: vlc_block_helper.h,v 1.6 2003/12/06 23:25:23 gbazin Exp $
+ * Copyright (C) 2003 the VideoLAN team
+ * $Id$
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -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_BLOCK_HELPER_H
 #define _VLC_BLOCK_HELPER_H 1
 
+#include <vlc_block.h>
+
 typedef struct block_bytestream_t
 {
     block_t             *p_chain;
@@ -460,7 +466,7 @@ static inline int block_FindStartcodeFromOffset(
     }
 
     /* Begin the search.
-     * We first look for an occurence of the 1st startcode byte and
+     * We first look for an occurrence of the 1st startcode byte and
      * if found, we do a more thorough check. */
     i_size = p_block->i_buffer + i_size;
     *pi_offset -= i_size;
@@ -501,6 +507,7 @@ static inline int block_FindStartcodeFromOffset(
         *pi_offset += i_offset;
     }
 
+    *pi_offset -= i_match;
     return VLC_EGENERIC;
 }