Commit 4ee9642a authored by Guillaume Poirier's avatar Guillaume Poirier

fix illegal identifiers in multiple inclusion guards

patch by Diego Biurrun % diego A biurrun P de %
parent 34ed6747
......@@ -21,10 +21,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#ifdef _BS_H
#warning FIXME Multiple inclusion of bs.h
#else
#define _BS_H
#ifndef X264_BS_H
#define X264_BS_H
typedef struct bs_s
{
......
......@@ -21,8 +21,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#ifndef _CABAC_H
#define _CABAC_H 1
#ifndef X264_CABAC_H
#define X264_CABAC_H
typedef struct
{
......
......@@ -21,8 +21,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#ifndef _COMMON_H
#define _COMMON_H 1
#ifndef X264_COMMON_H
#define X264_COMMON_H
/****************************************************************************
* Macros
......
......@@ -21,8 +21,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#ifndef _CPU_H
#define _CPU_H 1
#ifndef X264_CPU_H
#define X264_CPU_H
uint32_t x264_cpu_detect( void );
int x264_cpu_num_processors( void );
......
......@@ -21,8 +21,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#ifndef _DCT_H
#define _DCT_H 1
#ifndef X264_DCT_H
#define X264_DCT_H
/* the inverse of the scaling factors introduced by 8x8 fdct */
#define W(i) (i==0 ? FIX8(1.0000) :\
......
......@@ -20,8 +20,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#ifndef _DISPLAY_H
#define _DISPLAY_H 1
#ifndef X264_DISPLAY_H
#define X264_DISPLAY_H
void disp_sync(void);
void disp_setcolor(unsigned char *name);
......
......@@ -21,8 +21,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#ifndef _FRAME_H
#define _FRAME_H 1
#ifndef X264_FRAME_H
#define X264_FRAME_H
/* number of pixels past the edge of the frame, for motion estimation/compensation */
#define PADH 32
......
......@@ -21,8 +21,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#ifndef _MACROBLOCK_H
#define _MACROBLOCK_H 1
#ifndef X264_MACROBLOCK_H
#define X264_MACROBLOCK_H
enum macroblock_position_e
{
......
......@@ -21,8 +21,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#ifndef _MC_H
#define _MC_H 1
#ifndef X264_MC_H
#define X264_MC_H
/* Do the MC
* XXX: Only width = 4, 8 or 16 are valid
......
......@@ -18,8 +18,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#ifndef _OSDEP_H
#define _OSDEP_H
#ifndef X264_OSDEP_H
#define X264_OSDEP_H
#define _LARGEFILE_SOURCE 1
#define _FILE_OFFSET_BITS 64
......@@ -127,4 +127,4 @@
#define x264_pthread_cond_wait(c,m) usleep(100)
#endif
#endif //_OSDEP_H
#endif /* X264_OSDEP_H */
......@@ -21,8 +21,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#ifndef _PIXEL_H
#define _PIXEL_H 1
#ifndef X264_PIXEL_H
#define X264_PIXEL_H
// SSD assumes all args aligned
// other cmp functions assume first arg aligned
......
......@@ -22,8 +22,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#ifndef _PPC_DCT_H
#define _PPC_DCT_H 1
#ifndef X264_PPC_DCT_H
#define X264_PPC_DCT_H
void x264_sub4x4_dct_altivec( int16_t dct[4][4],
uint8_t *pix1, uint8_t *pix2 );
......
......@@ -21,8 +21,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#ifndef _PPC_MC_H
#define _PPC_MC_H 1
#ifndef X264_PPC_MC_H
#define X264_PPC_MC_H
void x264_mc_altivec_init( x264_mc_functions_t *pf );
......
......@@ -21,8 +21,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#ifndef _PPC_PIXEL_H
#define _PPC_PIXEL_H 1
#ifndef X264_PPC_PIXEL_H
#define X264_PPC_PIXEL_H
void x264_pixel_altivec_init( x264_pixel_function_t *pixf );
......
......@@ -20,9 +20,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#ifndef _ALTIVEC_PREDICT_H
#define _ALTIVEC_PREDICT_H 1
#ifndef X264_ALTIVEC_PREDICT_H
#define X264_ALTIVEC_PREDICT_H
void x264_predict_16x16_init_altivec ( x264_predict_t pf[7] );
#endif // _ALTIVEC_PREDICT_H
#endif /* X264_ALTIVEC_PREDICT_H */
......@@ -18,8 +18,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#ifndef _PPC_QUANT_H
#define _PPC_QUANT_H 1
#ifndef X264_PPC_QUANT_H
#define X264_PPC_QUANT_H
void x264_quant_4x4_altivec( int16_t dct[4][4], uint16_t mf[16], uint16_t bias[16] );
void x264_quant_8x8_altivec( int16_t dct[8][8], uint16_t mf[64], uint16_t bias[64] );
......
......@@ -21,8 +21,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#ifndef _PREDICT_H
#define _PREDICT_H 1
#ifndef X264_PREDICT_H
#define X264_PREDICT_H
typedef void (*x264_predict_t)( uint8_t *src );
typedef void (*x264_predict8x8_t)( uint8_t *src, uint8_t edge[33] );
......
......@@ -20,8 +20,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#ifndef _QUANT_H
#define _QUANT_H 1
#ifndef X264_QUANT_H
#define X264_QUANT_H
typedef struct
{
......
......@@ -21,8 +21,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#ifndef _SET_H
#define _SET_H 1
#ifndef X264_SET_H
#define X264_SET_H
enum profile_e
{
......
......@@ -21,8 +21,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#ifndef _SPARC_PIXEL_H
#define _SPARC_PIXEL_H 1
#ifndef X264_SPARC_PIXEL_H
#define X264_SPARC_PIXEL_H
int x264_pixel_sad_8x8_vis( uint8_t *, int, uint8_t *, int );
int x264_pixel_sad_8x16_vis( uint8_t *, int, uint8_t *, int );
......
......@@ -20,8 +20,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#ifndef _VISUALIZE_H
#define _VISUALIZE_H 1
#ifndef X264_VISUALIZE_H
#define X264_VISUALIZE_H
#include "common/common.h"
......
......@@ -20,8 +20,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#ifndef _I386_DCT_H
#define _I386_DCT_H 1
#ifndef X264_I386_DCT_H
#define X264_I386_DCT_H
void x264_sub4x4_dct_mmx( int16_t dct[4][4], uint8_t *pix1, uint8_t *pix2 );
void x264_sub8x8_dct_mmx( int16_t dct[4][4][4], uint8_t *pix1, uint8_t *pix2 );
......
......@@ -20,8 +20,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#ifndef _I386_MC_H
#define _I386_MC_H 1
#ifndef X264_I386_MC_H
#define X264_I386_MC_H
void x264_mc_init_mmx( int cpu, x264_mc_functions_t *pf );
......
......@@ -21,8 +21,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#ifndef _I386_PIXEL_H
#define _I386_PIXEL_H 1
#ifndef X264_I386_PIXEL_H
#define X264_I386_PIXEL_H
#define DECL_PIXELS( ret, name, suffix, args ) \
ret x264_pixel_##name##_16x16_##suffix args;\
......
......@@ -20,8 +20,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#ifndef _I386_PREDICT_H
#define _I386_PREDICT_H 1
#ifndef X264_I386_PREDICT_H
#define X264_I386_PREDICT_H
void x264_predict_16x16_init_mmx ( int cpu, x264_predict_t pf[7] );
void x264_predict_8x8c_init_mmx ( int cpu, x264_predict_t pf[7] );
......
......@@ -20,8 +20,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#ifndef _I386_QUANT_H
#define _I386_QUANT_H 1
#ifndef X264_I386_QUANT_H
#define X264_I386_QUANT_H
void x264_quant_2x2_dc_mmxext( int16_t dct[2][2], int mf, int bias );
void x264_quant_4x4_dc_mmxext( int16_t dct[4][4], int mf, int bias );
......
......@@ -21,8 +21,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, 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 );
void x264_slicetype_decide( x264_t *h );
......
......@@ -21,8 +21,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#ifndef _ENCODER_MACROBLOCK_H
#define _ENCODER_MACROBLOCK_H 1
#ifndef X264_ENCODER_MACROBLOCK_H
#define X264_ENCODER_MACROBLOCK_H
#include "common/macroblock.h"
......
......@@ -21,8 +21,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#ifndef _ME_H
#define _ME_H 1
#ifndef X264_ME_H
#define X264_ME_H
#define COST_MAX (1<<28)
......
......@@ -21,8 +21,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#ifndef _RATECONTROL_H
#define _RATECONTROL_H 1
#ifndef X264_RATECONTROL_H
#define X264_RATECONTROL_H
int x264_ratecontrol_new ( x264_t * );
void x264_ratecontrol_delete( x264_t * );
......
......@@ -21,8 +21,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#ifndef _ENCODER_SET_H
#define _ENCODER_SET_H 1
#ifndef X264_ENCODER_SET_H
#define X264_ENCODER_SET_H
void x264_sps_init( x264_sps_t *sps, int i_id, x264_param_t *param );
void x264_sps_write( bs_t *s, x264_sps_t *sps );
......
#ifndef __X264_GTK_H__
#define __X264_GTK_H__
#ifndef X264_GTK_H
#define X264_GTK_H
#include "x264_gtk_enum.h"
......@@ -108,4 +108,4 @@ void x264_gtk_shutdown (GtkWidget *dialog);
void x264_gtk_free (X264_Gtk *x264_gtk);
#endif /* __X264_GTK_H__ */
#endif /* X264_GTK_H */
#ifndef __X264_GTK_BITRATE_H__
#define __X264_GTK_BITRATE_H__
#ifndef X264_GTK_BITRATE_H
#define X264_GTK_BITRATE_H
GtkWidget *_bitrate_page (X264_Gui_Config *config);
#endif /* __X264_GTK_BITRATE_H__ */
#endif /* X264_GTK_BITRATE_H */
#ifndef __X264_GTK_CQM_H__
#define __X264_GTK_CQM_H__
#ifndef X264_GTK_CQM_H
#define X264_GTK_CQM_H
GtkWidget *_cqm_page (X264_Gui_Config *config);
#endif /* __X264_GTK_CQM_H__ */
#endif /* X264_GTK_CQM_H */
#ifndef __X264_GTK_MUXERS_H__
#define __X264_GTK_MUXERS_H__
#ifndef X264_GTK_MUXERS_H
#define X264_GTK_MUXERS_H
#include "../config.h"
#include "../muxers.h"
......@@ -15,4 +15,4 @@ typedef enum {
} X264_Demuxer_Type;
/* static int X264_Num_Demuxers = (int)X264_DEMUXER_UNKOWN; */
#endif /* __X264_GTK_MUXERS_H__ */
#endif /* X264_GTK_MUXERS_H */
#ifndef __X264_GTK_ENCODE_ENCODE_H__
#define __X264_GTK_ENCODE_ENCODE_H__
#ifndef X264_GTK_ENCODE_ENCODE_H
#define X264_GTK_ENCODE_ENCODE_H
gpointer x264_gtk_encode_encode (X264_Thread_Data *thread_data);
#endif /* __X264_GTK_ENCODE_ENCODE_H__ */
#endif /* X264_GTK_ENCODE_ENCODE_H */
#ifndef __X264_GTK_ENCODE_MAIN_WINDOW_H__
#define __X264_GTK_ENCODE_MAIN_WINDOW_H__
#ifndef X264_GTK_ENCODE_MAIN_WINDOW_H
#define X264_GTK_ENCODE_MAIN_WINDOW_H
void x264_gtk_encode_main_window ();
#endif /* __X264_GTK_ENCODE_MAIN_WINDOW_H__ */
#endif /* X264_GTK_ENCODE_MAIN_WINDOW_H */
#ifndef __X264_GTK_ENCODE_PRIVATE_H__
#define __X264_GTK_ENCODE_PRIVATE_H__
#ifndef X264_GTK_ENCODE_PRIVATE_H
#define X264_GTK_ENCODE_PRIVATE_H
#define __UNUSED__ __attribute__((unused))
......@@ -43,4 +43,4 @@ struct X264_Pipe_Data_
};
#endif /* __X264_GTK_ENCODE_PRIVATE_H__ */
#endif /* X264_GTK_ENCODE_PRIVATE_H */
#ifndef __X264_GTK_ENCODE_STATUS_WINDOW_H__
#define __X264_GTK_ENCODE_STATUS_WINDOW_H__
#ifndef X264_GTK_ENCODE_STATUS_WINDOW_H
#define X264_GTK_ENCODE_STATUS_WINDOW_H
GtkWidget *x264_gtk_encode_status_window (X264_Thread_Data *thread_data);
#endif /* __X264_GTK_ENCODE_STATUS_WINDOW_H__ */
#endif /* X264_GTK_ENCODE_STATUS_WINDOW_H */
#ifndef __X264_GTK_ENUM_H__
#define __X264_GTK_ENUM_H__
#ifndef X264_GTK_ENUM_H
#define X264_GTK_ENUM_H
typedef enum
{
......@@ -54,4 +54,4 @@ typedef enum
}X264_Cqm_Preset;
#endif /* __X264_GTK_ENUM_H__ */
#endif /* X264_GTK_ENUM_H */
#ifndef _X264_GTK_I18N_
#define _X264_GTK_I18N_
#ifndef X264_GTK_I18N_H
#define X264_GTK_I18N_H
#include <libintl.h>
......@@ -8,7 +8,7 @@
#define _(X) gettext(X)
#define GETTEXT_DOMAIN "x264_gtk"
#ifdef __X264_GTK_PRIVATE_H__
#ifdef X264_GTK_PRIVATE_H
/* x264_path must be known for this to work */
# define BIND_X264_TEXTDOMAIN() \
gchar* _tmp = x264_gtk_path("locale"); \
......@@ -21,4 +21,4 @@
#endif
#endif /* _X264_GTK_I18N_ */
#endif /* X264_GTK_I18N_H */
#ifndef __X264_GTK_MB_H__
#define __X264_GTK_MB_H__
#ifndef X264_GTK_MB_H
#define X264_GTK_MB_H
GtkWidget *_mb_page (X264_Gui_Config *config);
#endif /* __X264_GTK_MB_H__ */
#endif /* X264_GTK_MB_H */
#ifndef __X264_GTK_MORE_H__
#define __X264_GTK_MORE_H__
#ifndef X264_GTK_MORE_H
#define X264_GTK_MORE_H
GtkWidget *_more_page (X264_Gui_Config *config);
#endif /* __X264_GTK_MORE_H__ */
#endif /* X264_GTK_MORE_H */
#ifndef __X264_GTK_PRIVATE_H__
#define __X264_GTK_PRIVATE_H__
#ifndef X264_GTK_PRIVATE_H
#define X264_GTK_PRIVATE_H
#define __UNUSED__ __attribute__((unused))
......@@ -171,4 +171,4 @@ struct X264_Gui_Zone_
gchar *x264_gtk_path (const char* more_path);
#endif /* __X264_GTK_PRIVATE_H__ */
#endif /* X264_GTK_PRIVATE_H */
#ifndef __X264_GTK_RC_H__
#define __X264_GTK_RC_H__
#ifndef X264_GTK_RC_H
#define X264_GTK_RC_H
GtkWidget *_rate_control_page (X264_Gui_Config *config);
#endif /* __X264_GTK_RC_H__ */
#endif /* X264_GTK_RC_H */
......@@ -21,8 +21,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#ifndef _MATROSKA_H
#define _MATROSKA_H 1
#ifndef X264_MATROSKA_H
#define X264_MATROSKA_H
typedef struct mk_Writer mk_Writer;
......
#ifndef _X264_MUXERS_H_
#define _X264_MUXERS_H_
#ifndef X264_MUXERS_H
#define X264_MUXERS_H
typedef void *hnd_t;
......
......@@ -21,8 +21,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#ifndef _X264_H
#define _X264_H 1
#ifndef X264_X264_H
#define X264_X264_H
#if !defined(_STDINT_H) && !defined(_STDINT_H_) && \
!defined(_INTTYPES_H) && !defined(_INTTYPES_H_)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment