From 0d90aec0fd7428a77b5c4c536ab65635669bc42d Mon Sep 17 00:00:00 2001 From: Mike Melanson Date: Sun, 14 Mar 2004 21:14:07 +0000 Subject: sync to ffmpeg build 4707 CVS patchset: 6253 CVS date: 2004/03/14 21:14:07 --- src/libffmpeg/libavcodec/libpostproc/Makefile.am | 2 +- src/libffmpeg/libavcodec/libpostproc/postprocess.c | 24 ++++++++++++++-------- 2 files changed, 16 insertions(+), 10 deletions(-) (limited to 'src/libffmpeg/libavcodec/libpostproc') diff --git a/src/libffmpeg/libavcodec/libpostproc/Makefile.am b/src/libffmpeg/libavcodec/libpostproc/Makefile.am index 26631d570..c9bb6ad4a 100644 --- a/src/libffmpeg/libavcodec/libpostproc/Makefile.am +++ b/src/libffmpeg/libavcodec/libpostproc/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/misc/Makefile.common -AM_CFLAGS = $(LIBFFMPEG_CFLAGS) +AM_CFLAGS = $(LIBFFMPEG_CFLAGS) -I../ ASFLAGS = noinst_LTLIBRARIES = libpostprocess.la diff --git a/src/libffmpeg/libavcodec/libpostproc/postprocess.c b/src/libffmpeg/libavcodec/libpostproc/postprocess.c index 093d94aea..9ac18eaf2 100644 --- a/src/libffmpeg/libavcodec/libpostproc/postprocess.c +++ b/src/libffmpeg/libavcodec/libpostproc/postprocess.c @@ -81,7 +81,7 @@ try to unroll inner for(x=0 ... loop to avoid these damn if(x ... checks //#undef ARCH_X86 //#define DEBUG_BRIGHTNESS #ifdef USE_FASTMEMCPY -#include "../fastmemcpy.h" +#include "fastmemcpy.h" #endif #include "postprocess.h" #include "postprocess_internal.h" @@ -103,14 +103,20 @@ try to unroll inner for(x=0 ... loop to avoid these damn if(x ... checks #define TEMP_STRIDE 8 //#define NUM_BLOCKS_AT_ONCE 16 //not used yet +#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define attribute_used __attribute__((used)) +#else +# define attribute_used +#endif + #ifdef ARCH_X86 -static uint64_t __attribute__((aligned(8))) w05= 0x0005000500050005LL; -static uint64_t __attribute__((aligned(8))) w20= 0x0020002000200020LL; -static uint64_t __attribute__((aligned(8))) b00= 0x0000000000000000LL; -static uint64_t __attribute__((aligned(8))) b01= 0x0101010101010101LL; -static uint64_t __attribute__((aligned(8))) b02= 0x0202020202020202LL; -static uint64_t __attribute__((aligned(8))) b08= 0x0808080808080808LL; -static uint64_t __attribute__((aligned(8))) b80= 0x8080808080808080LL; +static uint64_t __attribute__((aligned(8))) attribute_used w05= 0x0005000500050005LL; +static uint64_t __attribute__((aligned(8))) attribute_used w20= 0x0020002000200020LL; +static uint64_t __attribute__((aligned(8))) attribute_used b00= 0x0000000000000000LL; +static uint64_t __attribute__((aligned(8))) attribute_used b01= 0x0101010101010101LL; +static uint64_t __attribute__((aligned(8))) attribute_used b02= 0x0202020202020202LL; +static uint64_t __attribute__((aligned(8))) attribute_used b08= 0x0808080808080808LL; +static uint64_t __attribute__((aligned(8))) attribute_used b80= 0x8080808080808080LL; #endif @@ -119,7 +125,7 @@ static uint8_t * const clip_tab= clip_table + 256; static int verbose= 0; -static const int deringThreshold= 20; +static const int attribute_used deringThreshold= 20; static struct PPFilter filters[]= -- cgit v1.2.3