Originally committed as revision 10179 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.5
| @@ -19,8 +19,8 @@ | |||||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||||
| */ | */ | ||||
| #ifndef _CMD_UTILS_H | |||||
| #define _CMD_UTILS_H | |||||
| #ifndef CMD_UTILS_H | |||||
| #define CMD_UTILS_H | |||||
| typedef struct { | typedef struct { | ||||
| const char *name; | const char *name; | ||||
| @@ -70,4 +70,4 @@ void print_error(const char *filename, int err); | |||||
| */ | */ | ||||
| void show_license(void); | void show_license(void); | ||||
| #endif /* _CMD_UTILS_H */ | |||||
| #endif /* CMD_UTILS_H */ | |||||
| @@ -20,8 +20,8 @@ | |||||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||||
| */ | */ | ||||
| #ifndef _DSPUTIL_ALTIVEC_ | |||||
| #define _DSPUTIL_ALTIVEC_ | |||||
| #ifndef DSPUTIL_ALTIVEC_H | |||||
| #define DSPUTIL_ALTIVEC_H | |||||
| #include "dsputil_ppc.h" | #include "dsputil_ppc.h" | ||||
| @@ -114,4 +114,4 @@ static inline vector unsigned char unaligned_load(int offset, uint8_t *src) | |||||
| #endif /* HAVE_ALTIVEC */ | #endif /* HAVE_ALTIVEC */ | ||||
| #endif /* _DSPUTIL_ALTIVEC_ */ | |||||
| #endif /* DSPUTIL_ALTIVEC_H */ | |||||
| @@ -18,8 +18,8 @@ | |||||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||||
| */ | */ | ||||
| #ifndef _DSPUTIL_PPC_ | |||||
| #define _DSPUTIL_PPC_ | |||||
| #ifndef DSPUTIL_PPC_H | |||||
| #define DSPUTIL_PPC_H | |||||
| #ifdef CONFIG_POWERPC_PERF | #ifdef CONFIG_POWERPC_PERF | ||||
| void powerpc_display_perf_report(void); | void powerpc_display_perf_report(void); | ||||
| @@ -152,4 +152,4 @@ extern unsigned long long perfdata[POWERPC_NUM_PMC_ENABLED][powerpc_perf_total][ | |||||
| #define POWERPC_PERF_STOP_COUNT(a, cond) do {} while (0) | #define POWERPC_PERF_STOP_COUNT(a, cond) do {} while (0) | ||||
| #endif /* CONFIG_POWERPC_PERF */ | #endif /* CONFIG_POWERPC_PERF */ | ||||
| #endif /* _DSPUTIL_PPC_ */ | |||||
| #endif /* DSPUTIL_PPC_H */ | |||||
| @@ -20,8 +20,8 @@ | |||||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||||
| */ | */ | ||||
| #ifndef _GCC_FIXES_ | |||||
| #define _GCC_FIXES_ | |||||
| #ifndef GCC_FIXES_H | |||||
| #define GCC_FIXES_H | |||||
| #ifdef HAVE_ALTIVEC_H | #ifdef HAVE_ALTIVEC_H | ||||
| #include <altivec.h> | #include <altivec.h> | ||||
| @@ -116,4 +116,4 @@ __ch (__bin_args_eq (vector unsigned int, (a1), vector unsigned int, (a2)), \ | |||||
| #define const_vector vector | #define const_vector vector | ||||
| #endif | #endif | ||||
| #endif /* _GCC_FIXES_ */ | |||||
| #endif /* GCC_FIXES_H */ | |||||
| @@ -25,8 +25,8 @@ | |||||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||||
| */ | */ | ||||
| #ifndef _DV_1394_H | |||||
| #define _DV_1394_H | |||||
| #ifndef DV_1394_H | |||||
| #define DV_1394_H | |||||
| #define DV1394_DEFAULT_CHANNEL 63 | #define DV1394_DEFAULT_CHANNEL 63 | ||||
| #define DV1394_DEFAULT_CARD 0 | #define DV1394_DEFAULT_CARD 0 | ||||
| @@ -353,4 +353,4 @@ struct dv1394_status { | |||||
| }; | }; | ||||
| #endif /* _DV_1394_H */ | |||||
| #endif /* DV_1394_H */ | |||||