Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
VideoLAN
x264
Commits
4ee9642a
Commit
4ee9642a
authored
Apr 24, 2008
by
Guillaume Poirier
Browse files
fix illegal identifiers in multiple inclusion guards
patch by Diego Biurrun % diego A biurrun P de %
parent
34ed6747
Changes
48
Hide whitespace changes
Inline
Side-by-side
common/bs.h
View file @
4ee9642a
...
...
@@ -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
{
...
...
common/cabac.h
View file @
4ee9642a
...
...
@@ -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
{
...
...
common/common.h
View file @
4ee9642a
...
...
@@ -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
...
...
common/cpu.h
View file @
4ee9642a
...
...
@@ -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
);
...
...
common/dct.h
View file @
4ee9642a
...
...
@@ -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) :\
...
...
common/display.h
View file @
4ee9642a
...
...
@@ -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
);
...
...
common/frame.h
View file @
4ee9642a
...
...
@@ -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
...
...
common/macroblock.h
View file @
4ee9642a
...
...
@@ -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
{
...
...
common/mc.h
View file @
4ee9642a
...
...
@@ -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
...
...
common/osdep.h
View file @
4ee9642a
...
...
@@ -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
*/
common/pixel.h
View file @
4ee9642a
...
...
@@ -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
...
...
common/ppc/dct.h
View file @
4ee9642a
...
...
@@ -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
);
...
...
common/ppc/mc.h
View file @
4ee9642a
...
...
@@ -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
);
...
...
common/ppc/pixel.h
View file @
4ee9642a
...
...
@@ -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
);
...
...
common/ppc/predict.h
View file @
4ee9642a
...
...
@@ -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
*/
common/ppc/quant.h
View file @
4ee9642a
...
...
@@ -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
]
);
...
...
common/predict.h
View file @
4ee9642a
...
...
@@ -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
]
);
...
...
common/quant.h
View file @
4ee9642a
...
...
@@ -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
{
...
...
common/set.h
View file @
4ee9642a
...
...
@@ -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
{
...
...
common/sparc/pixel.h
View file @
4ee9642a
...
...
@@ -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
);
...
...
Prev
1
2
3
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment