Mercurial > libavcodec.hg
changeset 5828:1876bc447aa4 libavcodec
Add missing multiple inclusion guards.
| author | diego |
|---|---|
| date | Wed, 17 Oct 2007 09:31:06 +0000 |
| parents | 5577fd4f31e1 |
| children | 74db916a3715 |
| files | armv4l/dsputil_iwmmxt_rnd.h bfin/config_bfin.h colorspace.h i386/dsputil_mmx_avg.h i386/dsputil_mmx_qns.h i386/dsputil_mmx_rnd.h |
| diffstat | 6 files changed, 27 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/armv4l/dsputil_iwmmxt_rnd.h Wed Oct 17 09:21:52 2007 +0000 +++ b/armv4l/dsputil_iwmmxt_rnd.h Wed Oct 17 09:31:06 2007 +0000 @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef FFMPEG_DSPUTIL_IWMMXT_RND_H +#define FFMPEG_DSPUTIL_IWMMXT_RND_H + void DEF(put, pixels8)(uint8_t *block, const uint8_t *pixels, const int line_size, int h) { int stride = line_size; @@ -1112,3 +1115,5 @@ : [line_size]"r"(line_size) : "r12", "memory"); } + +#endif /* FFMPEG_DSPUTIL_IWMMXT_RND_H */
--- a/bfin/config_bfin.h Wed Oct 17 09:21:52 2007 +0000 +++ b/bfin/config_bfin.h Wed Oct 17 09:31:06 2007 +0000 @@ -29,6 +29,10 @@ rts; */ + +#ifndef FFMPEG_CONFIG_BFIN_H +#define FFMPEG_CONFIG_BFIN_H + #ifndef DEFUN #ifndef mL1 @@ -49,3 +53,4 @@ #endif +#endif /* FFMPEG_CONFIG_BFIN_H */
--- a/colorspace.h Wed Oct 17 09:21:52 2007 +0000 +++ b/colorspace.h Wed Oct 17 09:31:06 2007 +0000 @@ -24,6 +24,9 @@ * Various defines for YUV<->RGB conversion */ +#ifndef FFMPEG_COLORSPACE_H +#define FFMPEG_COLORSPACE_H + #define SCALEBITS 10 #define ONE_HALF (1 << (SCALEBITS - 1)) #define FIX(x) ((int) ((x) * (1<<SCALEBITS) + 0.5)) @@ -105,3 +108,4 @@ (((FIX(0.50000*224.0/255.0) * r1 - FIX(0.41869*224.0/255.0) * g1 - \ FIX(0.08131*224.0/255.0) * b1 + (ONE_HALF << shift) - 1) >> (SCALEBITS + shift)) + 128) +#endif /* FFMPEG_COLORSPACE_H */
--- a/i386/dsputil_mmx_avg.h Wed Oct 17 09:21:52 2007 +0000 +++ b/i386/dsputil_mmx_avg.h Wed Oct 17 09:31:06 2007 +0000 @@ -24,6 +24,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef FFMPEG_DSPUTIL_MMX_AVG_H +#define FFMPEG_DSPUTIL_MMX_AVG_H + /* XXX: we use explicit registers to avoid a gcc 2.95.2 register asm clobber bug - now it will work with 2.95.2 and also with -fPIC */ @@ -869,3 +872,5 @@ QPEL_2TAP_L3(put_) #undef STORE_OP #undef QPEL_2TAP_L3 + +#endif /* FFMPEG_DSPUTIL_MMX_AVG_H */
--- a/i386/dsputil_mmx_qns.h Wed Oct 17 09:21:52 2007 +0000 +++ b/i386/dsputil_mmx_qns.h Wed Oct 17 09:31:06 2007 +0000 @@ -22,6 +22,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef FFMPEG_DSPUTIL_MMX_QNS_H +#define FFMPEG_DSPUTIL_MMX_QNS_H + #define MAX_ABS (512 >> (SCALE_OFFSET>0 ? SCALE_OFFSET : 0)) static int DEF(try_8x8basis)(int16_t rem[64], int16_t weight[64], int16_t basis[64], int scale) @@ -100,3 +103,4 @@ } } +#endif /* FFMPEG_DSPUTIL_MMX_QNS_H */
--- a/i386/dsputil_mmx_rnd.h Wed Oct 17 09:21:52 2007 +0000 +++ b/i386/dsputil_mmx_rnd.h Wed Oct 17 09:31:06 2007 +0000 @@ -24,6 +24,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef FFMPEG_DSPUTIL_MMX_RND_H +#define FFMPEG_DSPUTIL_MMX_RND_H + // put_pixels static void DEF(put, pixels8_x2)(uint8_t *block, const uint8_t *pixels, int line_size, int h) { @@ -589,4 +592,4 @@ DEF(avg, pixels8_xy2)(block+8, pixels+8, line_size, h); } - +#endif /* FFMPEG_DSPUTIL_MMX_RND_H */