Commit ab54bff2 authored by Aurelien Jacobs's avatar Aurelien Jacobs

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
parent 5b21bdab
......@@ -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 */
......@@ -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 */
......@@ -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 */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment