summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2007-10-17 11:19:42 +0000
committerAurelien Jacobs <aurel@gnuage.org>2007-10-17 11:19:42 +0000
commitab54bff20a800ce84b541cf45a660518aba248f3 (patch)
tree5cce3581b32e9c38c585703ee944298e99c24857 /libavcodec
parent5b21bdabe43611385d1d55a21d5b1f607b133d29 (diff)
Remove wrong multiple inclusion guards.
Those files are really meant to be included several times. Originally committed as revision 10766 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/i386/dsputil_mmx_avg.h5
-rw-r--r--libavcodec/i386/dsputil_mmx_qns.h5
-rw-r--r--libavcodec/i386/dsputil_mmx_rnd.h5
3 files changed, 0 insertions, 15 deletions
diff --git a/libavcodec/i386/dsputil_mmx_avg.h b/libavcodec/i386/dsputil_mmx_avg.h
index 63c714a144..d37d300646 100644
--- a/libavcodec/i386/dsputil_mmx_avg.h
+++ b/libavcodec/i386/dsputil_mmx_avg.h
@@ -24,9 +24,6 @@
* 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
*/
@@ -872,5 +869,3 @@ QPEL_2TAP_L3(avg_)
QPEL_2TAP_L3(put_)
#undef STORE_OP
#undef QPEL_2TAP_L3
-
-#endif /* FFMPEG_DSPUTIL_MMX_AVG_H */
diff --git a/libavcodec/i386/dsputil_mmx_qns.h b/libavcodec/i386/dsputil_mmx_qns.h
index 1f8c27bfe8..d2524c2221 100644
--- a/libavcodec/i386/dsputil_mmx_qns.h
+++ b/libavcodec/i386/dsputil_mmx_qns.h
@@ -22,9 +22,6 @@
* 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)
@@ -102,5 +99,3 @@ static void DEF(add_8x8basis)(int16_t rem[64], int16_t basis[64], int scale)
}
}
}
-
-#endif /* FFMPEG_DSPUTIL_MMX_QNS_H */
diff --git a/libavcodec/i386/dsputil_mmx_rnd.h b/libavcodec/i386/dsputil_mmx_rnd.h
index 2b28fd4568..cd75c4d5f0 100644
--- a/libavcodec/i386/dsputil_mmx_rnd.h
+++ b/libavcodec/i386/dsputil_mmx_rnd.h
@@ -24,9 +24,6 @@
* 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)
{
@@ -591,5 +588,3 @@ static void DEF(avg, pixels16_xy2)(uint8_t *block, const uint8_t *pixels, int li
DEF(avg, pixels8_xy2)(block , pixels , line_size, h);
DEF(avg, pixels8_xy2)(block+8, pixels+8, line_size, h);
}
-
-#endif /* FFMPEG_DSPUTIL_MMX_RND_H */