Fix bug in intra analysis in B-frames

[x264] / encoder / analyse.h

diff --git a/encoder/analyse.h b/encoder/analyse.h
index d68e7d6b37ed7e66b74c96f25704a60856a84f96..a2a04a557670caed15bc84220612e72e8428fbe0 100644 (file)
--- a/encoder/analyse.h
+++ b/encoder/analyse.h
@@ -1,10 +1,10 @@
 /*****************************************************************************
  * analyse.h: h264 encoder library
  *****************************************************************************
- * Copyright (C) 2003 Laurent Aimar
- * $Id: analyse.h,v 1.1 2004/06/03 19:27:08 fenrir Exp $
+ * Copyright (C) 2003-2008 x264 project
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
+ *          Loren Merritt <lorenm@u.washington.edu>
  *
  * 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
@@ -18,13 +18,14 @@
  *
  * 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  02111, USA.
  *****************************************************************************/
 
-#ifndef _ANALYSE_H
-#define _ANALYSE_H 1
+#ifndef X264_ANALYSE_H
+#define X264_ANALYSE_H
 
-void x264_macroblock_analyse( x264_t *h );
+int  x264_macroblock_analyse( x264_t *h );
 void x264_slicetype_decide( x264_t *h );
+int  x264_lowres_context_alloc( x264_t *h );
 
 #endif