diff options
Diffstat (limited to 'k9decmpeg')
| -rw-r--r-- | k9decmpeg/attributes.h | 5 | ||||
| -rw-r--r-- | k9decmpeg/convert_internal.h | 5 | ||||
| -rw-r--r-- | k9decmpeg/kdecmpeg2.cpp | 1 | ||||
| -rw-r--r-- | k9decmpeg/mmx.h | 5 | ||||
| -rw-r--r-- | k9decmpeg/mpeg2_internal.h | 5 | ||||
| -rw-r--r-- | k9decmpeg/tendra.h | 5 | ||||
| -rw-r--r-- | k9decmpeg/video_out.h | 5 | ||||
| -rw-r--r-- | k9decmpeg/vis.h | 5 | ||||
| -rw-r--r-- | k9decmpeg/vlc.h | 5 |
9 files changed, 41 insertions, 0 deletions
diff --git a/k9decmpeg/attributes.h b/k9decmpeg/attributes.h index 1c58c0a..8a64fcf 100644 --- a/k9decmpeg/attributes.h +++ b/k9decmpeg/attributes.h @@ -21,6 +21,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef ATTRIBUTES_H +#define ATTRIBUTES_H + /* use gcc attribs to align critical data structures */ #ifdef ATTRIBUTE_ALIGNED_MAX #define ATTR_ALIGN(align) __attribute__ ((__aligned__ ((ATTRIBUTE_ALIGNED_MAX < align) ? ATTRIBUTE_ALIGNED_MAX : align))) @@ -35,3 +38,5 @@ #define likely(x) (x) #define unlikely(x) (x) #endif + +#endif /* ATTRIBUTES_H */ diff --git a/k9decmpeg/convert_internal.h b/k9decmpeg/convert_internal.h index 02615fc..07b6608 100644 --- a/k9decmpeg/convert_internal.h +++ b/k9decmpeg/convert_internal.h @@ -21,6 +21,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef CONVERT_INTERNAL_H +#define CONVERT_INTERNAL_H + typedef struct { uint8_t * rgb_ptr; int width; @@ -39,3 +42,5 @@ mpeg2convert_copy_t * mpeg2convert_rgb_mmx (int bpp, int mode, const mpeg2_sequence_t * seq); mpeg2convert_copy_t * mpeg2convert_rgb_vis (int bpp, int mode, const mpeg2_sequence_t * seq); + +#endif /* CONVERT_INTERNAL_H */ diff --git a/k9decmpeg/kdecmpeg2.cpp b/k9decmpeg/kdecmpeg2.cpp index 662eb28..597e3de 100644 --- a/k9decmpeg/kdecmpeg2.cpp +++ b/k9decmpeg/kdecmpeg2.cpp @@ -438,3 +438,4 @@ void kDecMPEG2::pause() { m_pause=true; } +#include "kdecmpeg2.moc" diff --git a/k9decmpeg/mmx.h b/k9decmpeg/mmx.h index a410caa..01943de 100644 --- a/k9decmpeg/mmx.h +++ b/k9decmpeg/mmx.h @@ -27,6 +27,9 @@ * values by ULL, lest they be truncated by the compiler) */ +#ifndef MMX_H +#define MMX_H + typedef union { long long q; /* Quadword (64-bit) value */ unsigned long long uq; /* Unsigned Quadword */ @@ -261,3 +264,5 @@ typedef union { #define pshufw_r2r(regs,regd,imm) mmx_r2ri(pshufw, regs, regd, imm) #define sfence() __asm__ __volatile__ ("sfence\n\t") + +#endif /* MMX_H */ diff --git a/k9decmpeg/mpeg2_internal.h b/k9decmpeg/mpeg2_internal.h index 7e6c1df..1cb483c 100644 --- a/k9decmpeg/mpeg2_internal.h +++ b/k9decmpeg/mpeg2_internal.h @@ -21,6 +21,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef MPEG2_INTERNAL_H +#define MPEG2_INTERNAL_H + /* macroblock modes */ #define MACROBLOCK_INTRA 1 #define MACROBLOCK_PATTERN 2 @@ -298,3 +301,5 @@ extern mpeg2_mc_t mpeg2_mc_3dnow; extern mpeg2_mc_t mpeg2_mc_altivec; extern mpeg2_mc_t mpeg2_mc_alpha; extern mpeg2_mc_t mpeg2_mc_vis; + +#endif /* MPEG2_INTERNAL_H */ diff --git a/k9decmpeg/tendra.h b/k9decmpeg/tendra.h index 7dd1179..0a3cfca 100644 --- a/k9decmpeg/tendra.h +++ b/k9decmpeg/tendra.h @@ -21,6 +21,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef TENDRA_H +#define TENDRA_H + #pragma TenDRA begin #pragma TenDRA longlong type warning @@ -33,3 +36,5 @@ int TenDRA; #endif /* TenDRA_check */ + +#endif /* TENDRA_H */ diff --git a/k9decmpeg/video_out.h b/k9decmpeg/video_out.h index 8962726..0189910 100644 --- a/k9decmpeg/video_out.h +++ b/k9decmpeg/video_out.h @@ -21,6 +21,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef VIDEO_OUT_H +#define VIDEO_OUT_H + struct mpeg2_sequence_s; struct mpeg2_convert_init_s; typedef struct { @@ -56,3 +59,5 @@ void vo_accel (uint32_t accel); /* return NULL terminated array of all drivers */ vo_driver_t const * vo_drivers (void); + +#endif /* VIDEO_OUT_H */ diff --git a/k9decmpeg/vis.h b/k9decmpeg/vis.h index f2cbb6b..2b57336 100644 --- a/k9decmpeg/vis.h +++ b/k9decmpeg/vis.h @@ -41,6 +41,9 @@ * the assembler to keep the binary from becoming tainted. */ +#ifndef VIS_H +#define VIS_H + #define vis_opc_base ((0x1 << 31) | (0x36 << 19)) #define vis_opf(X) ((X) << 5) #define vis_sreg(X) (X) @@ -326,3 +329,5 @@ static inline void vis_alignaddrl_g0(void *_ptr) /* Pixel component distance. */ #define vis_pdist(rs1,rs2,rd) vis_dd2d(0x3e, rs1, rs2, rd) + +#endif /* VIS_H */ diff --git a/k9decmpeg/vlc.h b/k9decmpeg/vlc.h index f82e595..7f19802 100644 --- a/k9decmpeg/vlc.h +++ b/k9decmpeg/vlc.h @@ -21,6 +21,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef VLC_H +#define VLC_H + #define GETWORD(bit_buf,shift,bit_ptr) \ do { \ bit_buf |= ((bit_ptr[0] << 8) | bit_ptr[1]) << (shift); \ @@ -427,3 +430,5 @@ static const MBAtab MBA_11 [] = { { 7, 7}, { 7, 7}, { 7, 7}, { 7, 7}, { 7, 7}, { 7, 7}, { 7, 7}, { 7, 7} }; + +#endif /* VLC_H */ |