Mercurial > libavcodec.hg
changeset 8590:7a463923ecd1 libavcodec
Change semantic of CONFIG_*, HAVE_* and ARCH_*.
They are now always defined to either 0 or 1.
line wrap: on
line diff
--- a/aac.c Tue Jan 13 21:13:45 2009 +0000 +++ b/aac.c Tue Jan 13 23:44:16 2009 +0000 @@ -435,7 +435,7 @@ ac->sf_offset = 60; } -#ifndef CONFIG_HARDCODED_TABLES +#if !CONFIG_HARDCODED_TABLES for (i = 0; i < 428; i++) ff_aac_pow2sf_tab[i] = pow(2, (i - 200)/4.); #endif /* CONFIG_HARDCODED_TABLES */
--- a/aactab.c Tue Jan 13 21:13:45 2009 +0000 +++ b/aactab.c Tue Jan 13 23:44:16 2009 +0000 @@ -899,7 +899,7 @@ codebook_vector8, codebook_vector10, }; -#ifdef CONFIG_HARDCODED_TABLES +#if CONFIG_HARDCODED_TABLES /** * Table of pow(2, (i - 200)/4.) used for different purposes depending on the
--- a/aactab.h Tue Jan 13 21:13:45 2009 +0000 +++ b/aactab.h Tue Jan 13 23:44:16 2009 +0000 @@ -65,7 +65,7 @@ extern const float *ff_aac_codebook_vectors[]; -#ifdef CONFIG_HARDCODED_TABLES +#if CONFIG_HARDCODED_TABLES extern const float ff_aac_pow2sf_tab[316]; #else extern float ff_aac_pow2sf_tab[316];
--- a/adpcm.c Tue Jan 13 21:13:45 2009 +0000 +++ b/adpcm.c Tue Jan 13 23:44:16 2009 +0000 @@ -153,7 +153,7 @@ /* XXX: implement encoding */ -#ifdef CONFIG_ENCODERS +#if CONFIG_ENCODERS static int adpcm_encode_init(AVCodecContext *avctx) { if (avctx->channels > 2) @@ -1589,7 +1589,7 @@ -#ifdef CONFIG_ENCODERS +#if CONFIG_ENCODERS #define ADPCM_ENCODER(id,name,long_name_) \ AVCodec name ## _encoder = { \ #name, \ @@ -1607,7 +1607,7 @@ #define ADPCM_ENCODER(id,name,long_name_) #endif -#ifdef CONFIG_DECODERS +#if CONFIG_DECODERS #define ADPCM_DECODER(id,name,long_name_) \ AVCodec name ## _decoder = { \ #name, \
--- a/alpha/dsputil_alpha_asm.S Tue Jan 13 21:13:45 2009 +0000 +++ b/alpha/dsputil_alpha_asm.S Tue Jan 13 23:44:16 2009 +0000 @@ -53,7 +53,7 @@ .frame sp, 0, ra .prologue 0 -#ifdef CONFIG_GPROF +#if CONFIG_GPROF lda AT, _mcount jsr AT, (AT), _mcount #endif @@ -150,7 +150,7 @@ .frame sp, 0, ra .prologue 0 -#ifdef CONFIG_GPROF +#if CONFIG_GPROF lda AT, _mcount jsr AT, (AT), _mcount #endif @@ -205,7 +205,7 @@ .frame sp, 0, ra .prologue 0 -#ifdef CONFIG_GPROF +#if CONFIG_GPROF lda AT, _mcount jsr AT, (AT), _mcount #endif
--- a/alpha/motion_est_mvi_asm.S Tue Jan 13 21:13:45 2009 +0000 +++ b/alpha/motion_est_mvi_asm.S Tue Jan 13 23:44:16 2009 +0000 @@ -55,7 +55,7 @@ .frame sp, 0, ra, 0 .prologue 0 -#ifdef CONFIG_GPROF +#if CONFIG_GPROF lda AT, _mcount jsr AT, (AT), _mcount #endif
--- a/arm/asm.S Tue Jan 13 21:13:45 2009 +0000 +++ b/arm/asm.S Tue Jan 13 23:44:16 2009 +0000 @@ -38,7 +38,7 @@ .endm .macro movrel rd, val -#if defined(HAVE_ARMV6T2) && !defined(CONFIG_SHARED) +#if HAVE_ARMV6T2 && !CONFIG_SHARED movw \rd, #:lower16:\val movt \rd, #:upper16:\val #else
--- a/arm/dsputil_arm.c Tue Jan 13 21:13:45 2009 +0000 +++ b/arm/dsputil_arm.c Tue Jan 13 23:44:16 2009 +0000 @@ -20,7 +20,7 @@ */ #include "libavcodec/dsputil.h" -#ifdef HAVE_IPP +#if HAVE_IPP #include <ipp.h> #endif @@ -93,7 +93,7 @@ ff_add_pixels_clamped(block, dest, line_size); } -#ifdef HAVE_IPP +#if HAVE_IPP static void simple_idct_ipp(DCTELEM *block) { ippiDCT8x8Inv_Video_16s_C1I(block); @@ -108,7 +108,7 @@ static void simple_idct_ipp_add(uint8_t *dest, int line_size, DCTELEM *block) { ippiDCT8x8Inv_Video_16s_C1I(block); -#ifdef HAVE_IWMMXT +#if HAVE_IWMMXT add_pixels_clamped_iwmmxt(block, dest, line_size); #else ff_add_pixels_clamped_ARM(block, dest, line_size); @@ -130,13 +130,13 @@ if (avctx->lowres == 0) { if(idct_algo == FF_IDCT_AUTO){ -#if defined(HAVE_IPP) +#if HAVE_IPP idct_algo = FF_IDCT_IPP; -#elif defined(HAVE_NEON) +#elif HAVE_NEON idct_algo = FF_IDCT_SIMPLENEON; -#elif defined(HAVE_ARMV6) +#elif HAVE_ARMV6 idct_algo = FF_IDCT_SIMPLEARMV6; -#elif defined(HAVE_ARMV5TE) +#elif HAVE_ARMV5TE idct_algo = FF_IDCT_SIMPLEARMV5TE; #else idct_algo = FF_IDCT_ARM; @@ -153,28 +153,28 @@ c->idct_add= simple_idct_ARM_add; c->idct = simple_idct_ARM; c->idct_permutation_type= FF_NO_IDCT_PERM; -#ifdef HAVE_ARMV6 +#if HAVE_ARMV6 } else if (idct_algo==FF_IDCT_SIMPLEARMV6){ c->idct_put= ff_simple_idct_put_armv6; c->idct_add= ff_simple_idct_add_armv6; c->idct = ff_simple_idct_armv6; c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM; #endif -#ifdef HAVE_ARMV5TE +#if HAVE_ARMV5TE } else if (idct_algo==FF_IDCT_SIMPLEARMV5TE){ c->idct_put= simple_idct_put_armv5te; c->idct_add= simple_idct_add_armv5te; c->idct = simple_idct_armv5te; c->idct_permutation_type = FF_NO_IDCT_PERM; #endif -#ifdef HAVE_IPP +#if HAVE_IPP } else if (idct_algo==FF_IDCT_IPP){ c->idct_put= simple_idct_ipp_put; c->idct_add= simple_idct_ipp_add; c->idct = simple_idct_ipp; c->idct_permutation_type= FF_NO_IDCT_PERM; #endif -#ifdef HAVE_NEON +#if HAVE_NEON } else if (idct_algo==FF_IDCT_SIMPLENEON){ c->idct_put= ff_simple_idct_put_neon; c->idct_add= ff_simple_idct_add_neon; @@ -201,17 +201,17 @@ c->put_no_rnd_pixels_tab[1][2] = put_no_rnd_pixels8_y2_arm; c->put_no_rnd_pixels_tab[1][3] = put_no_rnd_pixels8_xy2_arm; -#ifdef HAVE_ARMV5TE +#if HAVE_ARMV5TE c->prefetch = ff_prefetch_arm; #endif -#ifdef HAVE_IWMMXT +#if HAVE_IWMMXT dsputil_init_iwmmxt(c, avctx); #endif -#ifdef HAVE_ARMVFP +#if HAVE_ARMVFP ff_float_init_arm_vfp(c, avctx); #endif -#ifdef HAVE_NEON +#if HAVE_NEON ff_dsputil_init_neon(c, avctx); #endif }
--- a/arm/dsputil_arm_s.S Tue Jan 13 21:13:45 2009 +0000 +++ b/arm/dsputil_arm_s.S Tue Jan 13 23:44:16 2009 +0000 @@ -24,12 +24,12 @@ preserve8 -#ifndef HAVE_PLD +#if !HAVE_PLD .macro pld reg .endm #endif -#ifdef HAVE_ARMV5TE +#if HAVE_ARMV5TE function ff_prefetch_arm, export=1 subs r2, r2, #1 pld [r0]
--- a/arm/dsputil_vfp.S Tue Jan 13 21:13:45 2009 +0000 +++ b/arm/dsputil_vfp.S Tue Jan 13 23:44:16 2009 +0000 @@ -133,7 +133,7 @@ bx lr .endfunc -#ifdef HAVE_ARMV6 +#if HAVE_ARMV6 /** * ARM VFP optimized float to int16 conversion. * Assume that len is a positive number and is multiple of 8, destination
--- a/arm/float_arm_vfp.c Tue Jan 13 21:13:45 2009 +0000 +++ b/arm/float_arm_vfp.c Tue Jan 13 23:44:16 2009 +0000 @@ -29,7 +29,7 @@ { c->vector_fmul = ff_vector_fmul_vfp; c->vector_fmul_reverse = ff_vector_fmul_reverse_vfp; -#ifdef HAVE_ARMV6 +#if HAVE_ARMV6 c->float_to_int16 = ff_float_to_int16_vfp; #endif }
--- a/arm/mathops.h Tue Jan 13 21:13:45 2009 +0000 +++ b/arm/mathops.h Tue Jan 13 23:44:16 2009 +0000 @@ -38,7 +38,7 @@ } #define MULH MULH -#ifdef HAVE_ARMV6 +#if HAVE_ARMV6 static inline av_const int MULH(int a, int b) { int r; @@ -73,7 +73,7 @@ #define MAC64(d, a, b) ((d) = MAC64(d, a, b)) #define MLS64(d, a, b) MAC64(d, -(a), b) -#if defined(HAVE_ARMV5TE) +#if HAVE_ARMV5TE /* signed 16x16 -> 32 multiply add accumulate */ # define MAC16(rt, ra, rb) \
--- a/arm/mpegvideo_arm.c Tue Jan 13 21:13:45 2009 +0000 +++ b/arm/mpegvideo_arm.c Tue Jan 13 23:44:16 2009 +0000 @@ -31,10 +31,10 @@ * allow optimized functions for armv5te unless * a better iwmmxt function exists */ -#ifdef HAVE_ARMV5TE +#if HAVE_ARMV5TE MPV_common_init_armv5te(s); #endif -#ifdef HAVE_IWMMXT +#if HAVE_IWMMXT MPV_common_init_iwmmxt(s); #endif }
--- a/asv1.c Tue Jan 13 21:13:45 2009 +0000 +++ b/asv1.c Tue Jan 13 23:44:16 2009 +0000 @@ -465,7 +465,7 @@ return (get_bits_count(&a->gb)+31)/32*4; } -#if defined(CONFIG_ASV1_ENCODER) || defined(CONFIG_ASV2_ENCODER) +#if CONFIG_ASV1_ENCODER || CONFIG_ASV2_ENCODER static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){ ASV1Context * const a = avctx->priv_data; AVFrame *pict = data; @@ -519,7 +519,7 @@ return size*4; } -#endif /* defined(CONFIG_ASV1_ENCODER) || defined(CONFIG_ASV2_ENCODER) */ +#endif /* CONFIG_ASV1_ENCODER || CONFIG_ASV2_ENCODER */ static av_cold void common_init(AVCodecContext *avctx){ ASV1Context * const a = avctx->priv_data; @@ -569,7 +569,7 @@ return 0; } -#if defined(CONFIG_ASV1_ENCODER) || defined(CONFIG_ASV2_ENCODER) +#if CONFIG_ASV1_ENCODER || CONFIG_ASV2_ENCODER static av_cold int encode_init(AVCodecContext *avctx){ ASV1Context * const a = avctx->priv_data; int i; @@ -593,7 +593,7 @@ return 0; } -#endif /* defined(CONFIG_ASV1_ENCODER) || defined(CONFIG_ASV2_ENCODER) */ +#endif /* CONFIG_ASV1_ENCODER || CONFIG_ASV2_ENCODER */ static av_cold int decode_end(AVCodecContext *avctx){ ASV1Context * const a = avctx->priv_data; @@ -631,7 +631,7 @@ .long_name= NULL_IF_CONFIG_SMALL("ASUS V2"), }; -#ifdef CONFIG_ASV1_ENCODER +#if CONFIG_ASV1_ENCODER AVCodec asv1_encoder = { "asv1", CODEC_TYPE_VIDEO, @@ -645,7 +645,7 @@ }; #endif -#ifdef CONFIG_ASV2_ENCODER +#if CONFIG_ASV2_ENCODER AVCodec asv2_encoder = { "asv2", CODEC_TYPE_VIDEO,
--- a/bfin/mathops.h Tue Jan 13 21:13:45 2009 +0000 +++ b/bfin/mathops.h Tue Jan 13 23:44:16 2009 +0000 @@ -22,7 +22,7 @@ #ifndef AVCODEC_BFIN_MATHOPS_H #define AVCODEC_BFIN_MATHOPS_H -#ifdef CONFIG_MPEGAUDIO_HP +#if CONFIG_MPEGAUDIO_HP #define MULH(X,Y) ({ int xxo; \ __asm__ ( \ "a1 = %2.L * %1.L (FU);\n\t" \
--- a/bitstream.h Tue Jan 13 21:13:45 2009 +0000 +++ b/bitstream.h Tue Jan 13 23:44:16 2009 +0000 @@ -41,7 +41,7 @@ //#define ALT_BITSTREAM_WRITER //#define ALIGNED_BITSTREAM_WRITER #if !defined(LIBMPEG2_BITSTREAM_READER) && !defined(A32_BITSTREAM_READER) && !defined(ALT_BITSTREAM_READER) -# ifdef ARCH_ARM +# if ARCH_ARM # define A32_BITSTREAM_READER # else # define ALT_BITSTREAM_READER @@ -52,7 +52,7 @@ extern const uint8_t ff_reverse[256]; -#if defined(ARCH_X86) +#if ARCH_X86 // avoid +32 for shift optimization (gcc should do that ...) static inline int32_t NEG_SSR32( int32_t a, int8_t s){ __asm__ ("sarl %1, %0\n\t" @@ -196,7 +196,7 @@ #ifdef BITSTREAM_WRITER_LE bit_buf |= value << (32 - bit_left); if (n >= bit_left) { -#ifndef HAVE_FAST_UNALIGNED +#if !HAVE_FAST_UNALIGNED if (3 & (intptr_t) s->buf_ptr) { s->buf_ptr[0] = bit_buf ; s->buf_ptr[1] = bit_buf >> 8; @@ -217,7 +217,7 @@ } else { bit_buf<<=bit_left; bit_buf |= value >> (n - bit_left); -#ifndef HAVE_FAST_UNALIGNED +#if !HAVE_FAST_UNALIGNED if (3 & (intptr_t) s->buf_ptr) { s->buf_ptr[0] = bit_buf >> 24; s->buf_ptr[1] = bit_buf >> 16; @@ -243,7 +243,7 @@ static inline void put_bits(PutBitContext *s, int n, unsigned int value) { # ifdef ALIGNED_BITSTREAM_WRITER -# if defined(ARCH_X86) +# if ARCH_X86 __asm__ volatile( "movl %0, %%ecx \n\t" "xorl %%eax, %%eax \n\t" @@ -274,7 +274,7 @@ s->index= index; # endif # else //ALIGNED_BITSTREAM_WRITER -# if defined(ARCH_X86) +# if ARCH_X86 __asm__ volatile( "movl $7, %%ecx \n\t" "andl %0, %%ecx \n\t" @@ -550,7 +550,7 @@ name##_bit_count-= 32;\ }\ -#if defined(ARCH_X86) +#if ARCH_X86 # define SKIP_CACHE(name, gb, num)\ __asm__(\ "shldl %2, %1, %0 \n\t"\
--- a/cabac.h Tue Jan 13 21:13:45 2009 +0000 +++ b/cabac.h Tue Jan 13 23:44:16 2009 +0000 @@ -270,7 +270,7 @@ c->bytestream+= CABAC_BITS/8; } -#if ! ( defined(ARCH_X86) && defined(HAVE_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) ) +#if ! ( ARCH_X86 && HAVE_7REGS && HAVE_EBX_AVAILABLE && !defined(BROKEN_RELOCATIONS) ) static void refill2(CABACContext *c){ int i, x; @@ -372,7 +372,7 @@ //FIXME gcc generates duplicate load/stores for c->low and c->range #define LOW "0" #define RANGE "4" -#ifdef ARCH_X86_64 +#if ARCH_X86_64 #define BYTESTART "16" #define BYTE "24" #define BYTEEND "32" @@ -381,7 +381,7 @@ #define BYTE "16" #define BYTEEND "20" #endif -#if defined(ARCH_X86) && defined(HAVE_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) +#if ARCH_X86 && HAVE_7REGS && HAVE_EBX_AVAILABLE && !defined(BROKEN_RELOCATIONS) int bit; #ifndef BRANCHLESS_CABAC_DECODER @@ -467,7 +467,7 @@ #else /* BRANCHLESS_CABAC_DECODER */ -#if defined HAVE_FAST_CMOV +#if HAVE_FAST_CMOV #define BRANCHLESS_GET_CABAC_UPDATE(ret, cabac, statep, low, lowword, range, tmp, tmpbyte)\ "mov "tmp" , %%ecx \n\t"\ "shl $17 , "tmp" \n\t"\ @@ -537,7 +537,7 @@ ); bit&=1; #endif /* BRANCHLESS_CABAC_DECODER */ -#else /* defined(ARCH_X86) && defined(HAVE_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) */ +#else /* ARCH_X86 && HAVE_7REGS && HAVE_EBX_AVAILABLE && !defined(BROKEN_RELOCATIONS) */ int s = *state; int RangeLPS= ff_h264_lps_range[2*(c->range&0xC0) + s]; int bit, lps_mask av_unused; @@ -576,7 +576,7 @@ if(!(c->low & CABAC_MASK)) refill2(c); #endif /* BRANCHLESS_CABAC_DECODER */ -#endif /* defined(ARCH_X86) && defined(HAVE_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) */ +#endif /* ARCH_X86 && HAVE_7REGS && HAVE_EBX_AVAILABLE && !defined(BROKEN_RELOCATIONS) */ return bit; } @@ -637,7 +637,7 @@ static av_always_inline int get_cabac_bypass_sign(CABACContext *c, int val){ -#if defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__)) +#if ARCH_X86 && !(defined(PIC) && defined(__GNUC__)) __asm__ volatile( "movl "RANGE "(%1), %%ebx \n\t" "movl "LOW "(%1), %%eax \n\t"
--- a/cljr.c Tue Jan 13 21:13:45 2009 +0000 +++ b/cljr.c Tue Jan 13 23:44:16 2009 +0000 @@ -30,6 +30,7 @@ /* Disable the encoder. */ #undef CONFIG_CLJR_ENCODER +#define CONFIG_CLJR_ENCODER 0 typedef struct CLJRContext{ AVCodecContext *avctx; @@ -84,7 +85,7 @@ return buf_size; } -#ifdef CONFIG_CLJR_ENCODER +#if CONFIG_CLJR_ENCODER static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){ CLJRContext * const a = avctx->priv_data; AVFrame *pict = data; @@ -124,7 +125,7 @@ return 0; } -#ifdef CONFIG_CLJR_ENCODER +#if CONFIG_CLJR_ENCODER static av_cold int encode_init(AVCodecContext *avctx){ common_init(avctx); @@ -146,7 +147,7 @@ .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"), }; -#ifdef CONFIG_CLJR_ENCODER +#if CONFIG_CLJR_ENCODER AVCodec cljr_encoder = { "cljr", CODEC_TYPE_VIDEO,
--- a/cscd.c Tue Jan 13 21:13:45 2009 +0000 +++ b/cscd.c Tue Jan 13 23:44:16 2009 +0000 @@ -23,7 +23,7 @@ #include "avcodec.h" -#ifdef CONFIG_ZLIB +#if CONFIG_ZLIB #include <zlib.h> #endif #include "libavutil/lzo.h" @@ -163,7 +163,7 @@ break; } case 1: { // zlib compression -#ifdef CONFIG_ZLIB +#if CONFIG_ZLIB unsigned long dlen = c->decomp_size; if (uncompress(c->decomp_buf, &dlen, &buf[2], buf_size - 2) != Z_OK) av_log(avctx, AV_LOG_ERROR, "error during zlib decompression\n");
--- a/dct-test.c Tue Jan 13 21:13:45 2009 +0000 +++ b/dct-test.c Tue Jan 13 23:44:16 2009 +0000 @@ -97,14 +97,14 @@ {"INT", 1, j_rev_dct, idct, MMX_PERM}, {"SIMPLE-C", 1, ff_simple_idct, idct, NO_PERM}, -#ifdef HAVE_MMX +#if HAVE_MMX {"MMX", 0, ff_fdct_mmx, fdct, NO_PERM, FF_MM_MMX}, -#ifdef HAVE_MMX2 +#if HAVE_MMX2 {"MMX2", 0, ff_fdct_mmx2, fdct, NO_PERM, FF_MM_MMXEXT}, {"SSE2", 0, ff_fdct_sse2, fdct, NO_PERM, FF_MM_SSE2}, #endif -#ifdef CONFIG_GPL +#if CONFIG_GPL {"LIBMPEG2-MMX", 1, ff_mmx_idct, idct, MMX_PERM, FF_MM_MMX}, {"LIBMPEG2-MMXEXT", 1, ff_mmxext_idct, idct, MMX_PERM, FF_MM_MMXEXT}, #endif @@ -114,25 +114,25 @@ {"XVID-SSE2", 1, ff_idct_xvid_sse2, idct, SSE2_PERM, FF_MM_SSE2}, #endif -#ifdef HAVE_ALTIVEC +#if HAVE_ALTIVEC {"altivecfdct", 0, fdct_altivec, fdct, NO_PERM, FF_MM_ALTIVEC}, #endif -#ifdef ARCH_BFIN +#if ARCH_BFIN {"BFINfdct", 0, ff_bfin_fdct, fdct, NO_PERM}, {"BFINidct", 1, ff_bfin_idct, idct, NO_PERM}, #endif -#ifdef ARCH_ARM +#if ARCH_ARM {"SIMPLE-ARM", 1, simple_idct_ARM, idct, NO_PERM }, {"INT-ARM", 1, j_rev_dct_ARM, idct, MMX_PERM }, -#ifdef HAVE_ARMV5TE +#if HAVE_ARMV5TE {"SIMPLE-ARMV5TE", 1, simple_idct_armv5te, idct, NO_PERM }, #endif -#ifdef HAVE_ARMV6 +#if HAVE_ARMV6 {"SIMPLE-ARMV6", 1, ff_simple_idct_armv6, idct, MMX_PERM }, #endif -#ifdef HAVE_NEON +#if HAVE_NEON {"SIMPLE-NEON", 1, ff_simple_idct_neon, idct, PARTTRANS_PERM }, #endif #endif /* ARCH_ARM */ @@ -186,7 +186,7 @@ static inline void mmx_emms(void) { -#ifdef HAVE_MMX +#if HAVE_MMX if (cpu_flags & FF_MM_MMX) __asm__ volatile ("emms\n\t"); #endif
--- a/dnxhdenc.c Tue Jan 13 21:13:45 2009 +0000 +++ b/dnxhdenc.c Tue Jan 13 23:44:16 2009 +0000 @@ -177,7 +177,7 @@ dsputil_init(&ctx->m.dsp, avctx); ff_dct_common_init(&ctx->m); -#ifdef HAVE_MMX +#if HAVE_MMX ff_dnxhd_init_mmx(ctx); #endif if (!ctx->m.dct_quantize)
--- a/dsputil.c Tue Jan 13 21:13:45 2009 +0000 +++ b/dsputil.c Tue Jan 13 23:44:16 2009 +0000 @@ -169,7 +169,7 @@ int j; j = src_scantable[i]; st->permutated[i] = permutation[j]; -#ifdef ARCH_PPC +#if ARCH_PPC st->inverse[j] = i; #endif } @@ -340,7 +340,7 @@ } -#ifdef CONFIG_SNOW_ENCODER //dwt is in snow.c +#if CONFIG_SNOW_ENCODER //dwt is in snow.c static inline int w_c(void *v, uint8_t * pix1, uint8_t * pix2, int line_size, int w, int h, int type){ int s, i, j; const int dec_count= w==8 ? 3 : 4; @@ -2711,7 +2711,7 @@ } } -#ifdef CONFIG_CAVS_DECODER +#if CONFIG_CAVS_DECODER /* AVS specific */ void ff_cavsdsp_init(DSPContext* c, AVCodecContext *avctx); @@ -2729,7 +2729,7 @@ } #endif /* CONFIG_CAVS_DECODER */ -#if defined(CONFIG_VC1_DECODER) || defined(CONFIG_WMV3_DECODER) +#if CONFIG_VC1_DECODER || CONFIG_WMV3_DECODER /* VC-1 specific */ void ff_vc1dsp_init(DSPContext* c, AVCodecContext *avctx); @@ -2743,11 +2743,11 @@ /* H264 specific */ void ff_h264dspenc_init(DSPContext* c, AVCodecContext *avctx); -#if defined(CONFIG_RV30_DECODER) +#if CONFIG_RV30_DECODER void ff_rv30dsp_init(DSPContext* c, AVCodecContext *avctx); #endif /* CONFIG_RV30_DECODER */ -#if defined(CONFIG_RV40_DECODER) +#if CONFIG_RV40_DECODER static void put_rv40_qpel16_mc33_c(uint8_t *dst, uint8_t *src, int stride){ put_pixels16_xy2_c(dst, src, stride, 16); } @@ -3467,7 +3467,7 @@ case FF_CMP_NSSE: cmp[i]= c->nsse[i]; break; -#ifdef CONFIG_SNOW_ENCODER +#if CONFIG_SNOW_ENCODER case FF_CMP_W53: cmp[i]= c->w53[i]; break; @@ -3518,7 +3518,7 @@ static void diff_bytes_c(uint8_t *dst, uint8_t *src1, uint8_t *src2, int w){ long i; -#ifndef HAVE_FAST_UNALIGNED +#if !HAVE_FAST_UNALIGNED if((long)src2 & (sizeof(long)-1)){ for(i=0; i+7<w; i+=8){ dst[i+0] = src1[i+0]-src2[i+0]; @@ -3686,7 +3686,7 @@ return s->dsp.sum_abs_dctelem(temp); } -#ifdef CONFIG_GPL +#if CONFIG_GPL #define DCT8_1D {\ const int s07 = SRC(0) + SRC(7);\ const int s16 = SRC(1) + SRC(6);\ @@ -3992,7 +3992,7 @@ WRAPPER8_16_SQ(hadamard8_diff8x8_c, hadamard8_diff16_c) WRAPPER8_16_SQ(hadamard8_intra8x8_c, hadamard8_intra16_c) WRAPPER8_16_SQ(dct_sad8x8_c, dct_sad16_c) -#ifdef CONFIG_GPL +#if CONFIG_GPL WRAPPER8_16_SQ(dct264_sad8x8_c, dct264_sad16_c) #endif WRAPPER8_16_SQ(dct_max8x8_c, dct_max16_c) @@ -4249,7 +4249,7 @@ if((long)&aligned & 15){ if(!did_fail){ -#if defined(HAVE_MMX) || defined(HAVE_ALTIVEC) +#if HAVE_MMX || HAVE_ALTIVEC av_log(NULL, AV_LOG_ERROR, "Compiler did not align stack variables. Libavcodec has been miscompiled\n" "and may be very slow or crash. This is not a bug in libavcodec,\n" @@ -4269,7 +4269,7 @@ ff_check_alignment(); -#ifdef CONFIG_ENCODERS +#if CONFIG_ENCODERS if(avctx->dct_algo==FF_DCT_FASTINT) { c->fdct = fdct_ifast; c->fdct248 = fdct_ifast248; @@ -4487,22 +4487,22 @@ c->draw_edges = draw_edges_c; -#ifdef CONFIG_CAVS_DECODER +#if CONFIG_CAVS_DECODER ff_cavsdsp_init(c,avctx); #endif -#if defined(CONFIG_VC1_DECODER) || defined(CONFIG_WMV3_DECODER) +#if CONFIG_VC1_DECODER || CONFIG_WMV3_DECODER ff_vc1dsp_init(c,avctx); #endif -#if defined(CONFIG_WMV2_DECODER) || defined(CONFIG_VC1_DECODER) || defined(CONFIG_WMV3_DECODER) +#if CONFIG_WMV2_DECODER || CONFIG_VC1_DECODER || CONFIG_WMV3_DECODER ff_intrax8dsp_init(c,avctx); #endif -#if defined(CONFIG_H264_ENCODER) +#if CONFIG_H264_ENCODER ff_h264dspenc_init(c,avctx); #endif -#if defined(CONFIG_RV30_DECODER) +#if CONFIG_RV30_DECODER ff_rv30dsp_init(c,avctx); #endif -#if defined(CONFIG_RV40_DECODER) +#if CONFIG_RV40_DECODER ff_rv40dsp_init(c,avctx); c->put_rv40_qpel_pixels_tab[0][15] = put_rv40_qpel16_mc33_c; c->avg_rv40_qpel_pixels_tab[0][15] = avg_rv40_qpel16_mc33_c; @@ -4527,7 +4527,7 @@ c->hadamard8_diff[4]= hadamard8_intra16_c; SET_CMP_FUNC(dct_sad) SET_CMP_FUNC(dct_max) -#ifdef CONFIG_GPL +#if CONFIG_GPL SET_CMP_FUNC(dct264_sad) #endif c->sad[0]= pix_abs16_c; @@ -4544,7 +4544,7 @@ c->vsse[4]= vsse_intra16_c; c->nsse[0]= nsse16_c; c->nsse[1]= nsse8_c; -#ifdef CONFIG_SNOW_ENCODER +#if CONFIG_SNOW_ENCODER c->w53[0]= w53_16_c; c->w53[1]= w53_8_c; c->w97[0]= w97_16_c; @@ -4558,7 +4558,7 @@ c->diff_bytes= diff_bytes_c; c->sub_hfyu_median_prediction= sub_hfyu_median_prediction_c; c->bswap_buf= bswap_buf; -#ifdef CONFIG_PNG_DECODER +#if CONFIG_PNG_DECODER c->add_png_paeth_prediction= ff_add_png_paeth_prediction; #endif @@ -4587,19 +4587,19 @@ c->try_8x8basis= try_8x8basis_c; c->add_8x8basis= add_8x8basis_c; -#ifdef CONFIG_SNOW_DECODER +#if CONFIG_SNOW_DECODER c->vertical_compose97i = ff_snow_vertical_compose97i; c->horizontal_compose97i = ff_snow_horizontal_compose97i; c->inner_add_yblock = ff_snow_inner_add_yblock; #endif -#ifdef CONFIG_VORBIS_DECODER +#if CONFIG_VORBIS_DECODER c->vorbis_inverse_coupling = vorbis_inverse_coupling; #endif -#ifdef CONFIG_AC3_DECODER +#if CONFIG_AC3_DECODER c->ac3_downmix = ff_ac3_downmix_c; #endif -#ifdef CONFIG_FLAC_ENCODER +#if CONFIG_FLAC_ENCODER c->flac_compute_autocorr = ff_flac_compute_autocorr; #endif c->vector_fmul = vector_fmul_c;
--- a/dsputil.h Tue Jan 13 21:13:45 2009 +0000 +++ b/dsputil.h Tue Jan 13 23:44:16 2009 +0000 @@ -174,7 +174,7 @@ const uint8_t *scantable; uint8_t permutated[64]; uint8_t raster_end[64]; -#ifdef ARCH_PPC +#if ARCH_PPC /** Used by dct_quantize_altivec to find last-non-zero */ DECLARE_ALIGNED(16, uint8_t, inverse[64]); #endif @@ -584,7 +584,7 @@ #define DECLARE_ALIGNED_16(t, v) DECLARE_ALIGNED(16, t, v) -#if defined(HAVE_MMX) +#if HAVE_MMX #undef emms_c @@ -608,23 +608,23 @@ void dsputil_init_pix_mmx(DSPContext* c, AVCodecContext *avctx); -#elif defined(ARCH_ARM) +#elif ARCH_ARM extern int mm_flags; -#ifdef HAVE_NEON +#if HAVE_NEON # define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(16, t, v) # define STRIDE_ALIGN 16 #endif -#elif defined(ARCH_PPC) +#elif ARCH_PPC extern int mm_flags; #define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(16, t, v) #define STRIDE_ALIGN 16 -#elif defined(HAVE_MMI) +#elif HAVE_MMI #define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(16, t, v) #define STRIDE_ALIGN 16
--- a/dv.c Tue Jan 13 21:13:45 2009 +0000 +++ b/dv.c Tue Jan 13 23:44:16 2009 +0000 @@ -1123,7 +1123,7 @@ return 0; } -#ifdef CONFIG_DVVIDEO_DECODER +#if CONFIG_DVVIDEO_DECODER /* NOTE: exactly one frame must be given (120000 bytes for NTSC, 144000 bytes for PAL - or twice those for 50Mbps) */ static int dvvideo_decode_frame(AVCodecContext *avctx, @@ -1240,7 +1240,7 @@ return 5; } -#ifdef CONFIG_DVVIDEO_ENCODER +#if CONFIG_DVVIDEO_ENCODER static void dv_format_frame(DVVideoContext* c, uint8_t* buf) { int chan, i, j, k; @@ -1328,7 +1328,7 @@ } -#ifdef CONFIG_DVVIDEO_ENCODER +#if CONFIG_DVVIDEO_ENCODER AVCodec dvvideo_encoder = { "dvvideo", CODEC_TYPE_VIDEO, @@ -1341,7 +1341,7 @@ }; #endif // CONFIG_DVVIDEO_ENCODER -#ifdef CONFIG_DVVIDEO_DECODER +#if CONFIG_DVVIDEO_DECODER AVCodec dvvideo_decoder = { "dvvideo", CODEC_TYPE_VIDEO,
--- a/error_resilience.c Tue Jan 13 21:13:45 2009 +0000 +++ b/error_resilience.c Tue Jan 13 23:44:16 2009 +0000 @@ -563,7 +563,7 @@ if(undamaged_count < 5) return 0; //almost all MBs damaged -> use temporal prediction -#ifdef CONFIG_XVMC +#if CONFIG_XVMC //prevent dsp.sad() check, that requires access to the image if(s->avctx->xvmc_acceleration && s->pict_type==FF_I_TYPE) return 1; #endif @@ -935,7 +935,7 @@ }else guess_mv(s); -#ifdef CONFIG_XVMC +#if CONFIG_XVMC /* the filters below are not XvMC compatible, skip them */ if(s->avctx->xvmc_acceleration) goto ec_clean; #endif @@ -1024,7 +1024,7 @@ v_block_filter(s, s->current_picture.data[2], s->mb_width , s->mb_height , s->uvlinesize, 0); } -#ifdef CONFIG_XVMC +#if CONFIG_XVMC ec_clean: #endif /* clean a few tables */
--- a/fft.c Tue Jan 13 21:13:45 2009 +0000 +++ b/fft.c Tue Jan 13 23:44:16 2009 +0000 @@ -91,7 +91,7 @@ s->imdct_half = ff_imdct_half_c; s->exptab1 = NULL; -#if defined HAVE_MMX && defined HAVE_YASM +#if HAVE_MMX && HAVE_YASM has_vectors = mm_support(); if (has_vectors & FF_MM_SSE) { /* SSE for P3/P4/K8 */ @@ -110,7 +110,7 @@ s->imdct_half = ff_imdct_half_3dn; s->fft_calc = ff_fft_calc_3dn; } -#elif defined HAVE_ALTIVEC && !defined ALTIVEC_USE_REFERENCE_C_CODE +#elif HAVE_ALTIVEC && !defined ALTIVEC_USE_REFERENCE_C_CODE has_vectors = mm_support(); if (has_vectors & FF_MM_ALTIVEC) { s->fft_calc = ff_fft_calc_altivec; @@ -336,7 +336,7 @@ TRANSFORM(z[1],z[3],z[5],z[7],sqrthalf,sqrthalf); } -#ifndef CONFIG_SMALL +#if !CONFIG_SMALL static void fft16(FFTComplex *z) { FFTSample t1, t2, t3, t4, t5, t6; @@ -358,7 +358,7 @@ DECL_FFT(128,64,32) DECL_FFT(256,128,64) DECL_FFT(512,256,128) -#ifndef CONFIG_SMALL +#if !CONFIG_SMALL #define pass pass_big #endif DECL_FFT(1024,512,256)
--- a/ffv1.c Tue Jan 13 21:13:45 2009 +0000 +++ b/ffv1.c Tue Jan 13 23:44:16 2009 +0000 @@ -350,7 +350,7 @@ return ret; } -#ifdef CONFIG_FFV1_ENCODER +#if CONFIG_FFV1_ENCODER static inline int encode_line(FFV1Context *s, int w, int_fast16_t *sample[2], int plane_index, int bits){ PlaneContext * const p= &s->plane[plane_index]; RangeCoder * const c= &s->c; @@ -543,7 +543,7 @@ return 0; } -#ifdef CONFIG_FFV1_ENCODER +#if CONFIG_FFV1_ENCODER static av_cold int encode_init(AVCodecContext *avctx) { FFV1Context *s = avctx->priv_data; @@ -632,7 +632,7 @@ } } -#ifdef CONFIG_FFV1_ENCODER +#if CONFIG_FFV1_ENCODER static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){ FFV1Context *f = avctx->priv_data; RangeCoder * const c= &f->c; @@ -1025,7 +1025,7 @@ .long_name= NULL_IF_CONFIG_SMALL("FFmpeg codec #1"), }; -#ifdef CONFIG_FFV1_ENCODER +#if CONFIG_FFV1_ENCODER AVCodec ffv1_encoder = { "ffv1", CODEC_TYPE_VIDEO,
--- a/flacenc.c Tue Jan 13 21:13:45 2009 +0000 +++ b/flacenc.c Tue Jan 13 23:44:16 2009 +0000 @@ -775,7 +775,7 @@ for(i=0; i<order; i++) { res[i] = smp[i]; } -#ifdef CONFIG_SMALL +#if CONFIG_SMALL for(i=order; i<n; i+=2) { int j; int s = smp[i];
--- a/g726.c Tue Jan 13 21:13:45 2009 +0000 +++ b/g726.c Tue Jan 13 23:44:16 2009 +0000 @@ -285,7 +285,7 @@ return 0; } -#ifdef CONFIG_ADPCM_G726_ENCODER +#if CONFIG_ADPCM_G726_ENCODER static int16_t g726_encode(G726Context* c, int16_t sig) { uint8_t i; @@ -342,7 +342,7 @@ return 0; } -#ifdef CONFIG_ADPCM_G726_ENCODER +#if CONFIG_ADPCM_G726_ENCODER static int g726_encode_frame(AVCodecContext *avctx, uint8_t *dst, int buf_size, void *data) { @@ -381,7 +381,7 @@ return buf_size; } -#ifdef CONFIG_ADPCM_G726_ENCODER +#if CONFIG_ADPCM_G726_ENCODER AVCodec adpcm_g726_encoder = { "g726", CODEC_TYPE_AUDIO,
--- a/h263.c Tue Jan 13 21:13:45 2009 +0000 +++ b/h263.c Tue Jan 13 23:44:16 2009 +0000 @@ -54,7 +54,7 @@ #define H263_MBTYPE_B_VLC_BITS 6 #define CBPC_B_VLC_BITS 3 -#ifdef CONFIG_ENCODERS +#if CONFIG_ENCODERS static void h263_encode_block(MpegEncContext * s, DCTELEM * block, int n); static void h263p_encode_umotion(MpegEncContext * s, int val); @@ -72,7 +72,7 @@ static inline int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr); static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block, int n, int coded, int intra, int rvlc); -#ifdef CONFIG_ENCODERS +#if CONFIG_ENCODERS static int h263_pred_dc(MpegEncContext * s, int n, int16_t **dc_val_ptr); static void mpeg4_encode_visual_object_header(MpegEncContext * s); static void mpeg4_encode_vol_header(MpegEncContext * s, int vo_number, int vol_number); @@ -80,7 +80,7 @@ static void mpeg4_decode_sprite_trajectory(MpegEncContext * s, GetBitContext *gb); static inline int ff_mpeg4_pred_dc(MpegEncContext * s, int n, int level, int *dir_ptr, int encoding); -#ifdef CONFIG_ENCODERS +#if CONFIG_ENCODERS static uint8_t uni_DCtab_lum_len[512]; static uint8_t uni_DCtab_chrom_len[512]; static uint16_t uni_DCtab_lum_bits[512]; @@ -155,7 +155,7 @@ ); } -#ifdef CONFIG_ENCODERS +#if CONFIG_ENCODERS static void aspect_to_info(MpegEncContext * s, AVRational aspect){ int i; @@ -736,7 +736,7 @@ } } -#ifdef CONFIG_ENCODERS +#if CONFIG_ENCODERS static inline int h263_get_motion_length(MpegEncContext * s, int val, int f_code){ int l, bit_size, code; @@ -1549,7 +1549,7 @@ } } -#ifdef CONFIG_ENCODERS +#if CONFIG_ENCODERS static int h263_pred_dc(MpegEncContext * s, int n, int16_t **dc_val_ptr) { int x, y, wrap, a, c, pred_dc, scale; @@ -1741,7 +1741,7 @@ return *mot_val; } -#ifdef CONFIG_ENCODERS +#if CONFIG_ENCODERS void ff_h263_encode_motion(MpegEncContext * s, int val, int f_code) { int range, l, bit_size, sign, code, bits; @@ -2652,7 +2652,7 @@ } -#ifdef CONFIG_ENCODERS +#if CONFIG_ENCODERS /** * encodes the dc value. @@ -3049,7 +3049,7 @@ tab[i] = val; } -#ifdef CONFIG_ENCODERS +#if CONFIG_ENCODERS void ff_mpeg4_init_partitions(MpegEncContext *s) { @@ -3106,7 +3106,7 @@ } } -#ifdef CONFIG_ENCODERS +#if CONFIG_ENCODERS void ff_mpeg4_encode_video_packet_header(MpegEncContext *s) { @@ -4563,7 +4563,7 @@ } else if (s->mb_intra) { /* DC coef */ if(s->codec_id == CODEC_ID_RV10){ -#ifdef CONFIG_RV10_DECODER +#if CONFIG_RV10_DECODER if (s->rv10_version == 3 && s->pict_type == FF_I_TYPE) { int component, diff; component = (n <= 3 ? 0 : n - 4 + 1);
--- a/h263dec.c Tue Jan 13 21:13:45 2009 +0000 +++ b/h263dec.c Tue Jan 13 23:44:16 2009 +0000 @@ -545,7 +545,7 @@ } #endif -#if defined(HAVE_MMX) +#if HAVE_MMX if(s->codec_id == CODEC_ID_MPEG4 && s->xvid_build && avctx->idct_algo == FF_IDCT_AUTO && (mm_flags & FF_MM_MMX)){ avctx->idct_algo= FF_IDCT_XVIDMMX; avctx->coded_width= 0; // force reinit
--- a/h264.c Tue Jan 13 21:13:45 2009 +0000 +++ b/h264.c Tue Jan 13 23:44:16 2009 +0000 @@ -36,7 +36,7 @@ #include "vdpau_internal.h" #include "cabac.h" -#ifdef ARCH_X86 +#if ARCH_X86 #include "x86/h264_i386.h" #endif @@ -1380,8 +1380,8 @@ printf("%2X ", src[i]); #endif -#ifdef HAVE_FAST_UNALIGNED -# ifdef HAVE_FAST_64BIT +#if HAVE_FAST_UNALIGNED +# if HAVE_FAST_64BIT # define RS 7 for(i=0; i+1<length; i+=9){ if(!((~*(uint64_t*)(src+i) & (*(uint64_t*)(src+i) - 0x0100010001000101ULL)) & 0x8000800080008080ULL)) @@ -5224,7 +5224,7 @@ uint8_t *last_coeff_ctx_base; uint8_t *abs_level_m1_ctx_base; -#ifndef ARCH_X86 +#if !ARCH_X86 #define CABAC_ON_STACK #endif #ifdef CABAC_ON_STACK @@ -5285,7 +5285,7 @@ index[coeff_count++] = last;\ } const uint8_t *sig_off = significant_coeff_flag_offset_8x8[MB_FIELD]; -#if defined(ARCH_X86) && defined(HAVE_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) +#if ARCH_X86 && HAVE_7REGS && HAVE_EBX_AVAILABLE && !defined(BROKEN_RELOCATIONS) coeff_count= decode_significance_8x8_x86(CC, significant_coeff_ctx_base, index, sig_off); } else { coeff_count= decode_significance_x86(CC, max_coeff, significant_coeff_ctx_base, index); @@ -5360,7 +5360,7 @@ } -#ifndef CONFIG_SMALL +#if !CONFIG_SMALL static void decode_cabac_residual_dc( H264Context *h, DCTELEM *block, int cat, int n, const uint8_t *scantable, const uint32_t *qmul, int max_coeff ) { decode_cabac_residual_internal(h, block, cat, n, scantable, qmul, max_coeff, 1); } @@ -5371,7 +5371,7 @@ #endif static void decode_cabac_residual( H264Context *h, DCTELEM *block, int cat, int n, const uint8_t *scantable, const uint32_t *qmul, int max_coeff ) { -#ifdef CONFIG_SMALL +#if CONFIG_SMALL decode_cabac_residual_internal(h, block, cat, n, scantable, qmul, max_coeff, cat == 0 || cat == 3); #else if( cat == 0 || cat == 3 ) decode_cabac_residual_dc(h, block, cat, n, scantable, qmul, max_coeff); @@ -6572,7 +6572,7 @@ filter_mb_mbaff_edgecv( h, &img_cr[0], uvlinesize, bS, rqp ); } -#ifdef CONFIG_SMALL +#if CONFIG_SMALL for( dir = 0; dir < 2; dir++ ) filter_mb_dir(h, mb_x, mb_y, img_y, img_cb, img_cr, linesize, uvlinesize, mb_xy, mb_type, mvy_limit, dir ? 0 : first_vertical_edge_done, dir); #else @@ -8023,7 +8023,7 @@ .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"), }; -#ifdef CONFIG_H264_VDPAU_DECODER +#if CONFIG_H264_VDPAU_DECODER AVCodec h264_vdpau_decoder = { "h264_vdpau", CODEC_TYPE_VIDEO, @@ -8039,6 +8039,6 @@ }; #endif -#ifdef CONFIG_SVQ3_DECODER +#if CONFIG_SVQ3_DECODER #include "svq3.c" #endif
--- a/h264_parser.c Tue Jan 13 21:13:45 2009 +0000 +++ b/h264_parser.c Tue Jan 13 23:44:16 2009 +0000 @@ -44,11 +44,11 @@ for(i=0; i<buf_size; i++){ if(state==7){ -#ifdef HAVE_FAST_UNALIGNED +#if HAVE_FAST_UNALIGNED /* we check i<buf_size instead of i+3/7 because its simpler * and there should be FF_INPUT_BUFFER_PADDING_SIZE bytes at the end */ -# ifdef HAVE_FAST_64BIT +# if HAVE_FAST_64BIT while(i<buf_size && !((~*(uint64_t*)(buf+i) & (*(uint64_t*)(buf+i) - 0x0101010101010101ULL)) & 0x8080808080808080ULL)) i+=8; # else
--- a/huffyuv.c Tue Jan 13 21:13:45 2009 +0000 +++ b/huffyuv.c Tue Jan 13 23:44:16 2009 +0000 @@ -261,7 +261,7 @@ return 0; } -#if defined(CONFIG_HUFFYUV_ENCODER) || defined(CONFIG_FFVHUFF_ENCODER) +#if CONFIG_HUFFYUV_ENCODER || CONFIG_FFVHUFF_ENCODER typedef struct { uint64_t val; int name; @@ -317,7 +317,7 @@ if(i==size) break; } } -#endif /* defined(CONFIG_HUFFYUV_ENCODER) || defined(CONFIG_FFVHUFF_ENCODER) */ +#endif /* CONFIG_HUFFYUV_ENCODER || CONFIG_FFVHUFF_ENCODER */ static void generate_joint_tables(HYuvContext *s){ uint16_t symbols[1<<VLC_BITS]; @@ -477,7 +477,7 @@ return 0; } -#if defined(CONFIG_HUFFYUV_DECODER) || defined(CONFIG_FFVHUFF_DECODER) +#if CONFIG_HUFFYUV_DECODER || CONFIG_FFVHUFF_DECODER static av_cold int decode_init(AVCodecContext *avctx) { HYuvContext *s = avctx->priv_data; @@ -573,9 +573,9 @@ return 0; } -#endif /* defined(CONFIG_HUFFYUV_DECODER) || defined(CONFIG_FFVHUFF_DECODER) */ +#endif /* CONFIG_HUFFYUV_DECODER || CONFIG_FFVHUFF_DECODER */ -#if defined(CONFIG_HUFFYUV_ENCODER) || defined(CONFIG_FFVHUFF_ENCODER) +#if CONFIG_HUFFYUV_ENCODER || CONFIG_FFVHUFF_ENCODER static int store_table(HYuvContext *s, uint8_t *len, uint8_t *buf){ int i; int index= 0; @@ -725,7 +725,7 @@ return 0; } -#endif /* defined(CONFIG_HUFFYUV_ENCODER) || defined(CONFIG_FFVHUFF_ENCODER) */ +#endif /* CONFIG_HUFFYUV_ENCODER || CONFIG_FFVHUFF_ENCODER */ /* TODO instead of restarting the read when the code isn't in the first level * of the joint table, jump into the 2nd level of the individual table. */ @@ -761,7 +761,7 @@ } } -#if defined(CONFIG_HUFFYUV_ENCODER) || defined(CONFIG_FFVHUFF_ENCODER) +#if CONFIG_HUFFYUV_ENCODER || CONFIG_FFVHUFF_ENCODER static int encode_422_bitstream(HYuvContext *s, int count){ int i; @@ -854,7 +854,7 @@ } return 0; } -#endif /* defined(CONFIG_HUFFYUV_ENCODER) || defined(CONFIG_FFVHUFF_ENCODER) */ +#endif /* CONFIG_HUFFYUV_ENCODER || CONFIG_FFVHUFF_ENCODER */ static av_always_inline void decode_bgr_1(HYuvContext *s, int count, int decorrelate, int alpha){ int i; @@ -931,7 +931,7 @@ return 0; } -#if defined(CONFIG_HUFFYUV_DECODER) || defined(CONFIG_FFVHUFF_DECODER) +#if CONFIG_HUFFYUV_DECODER || CONFIG_FFVHUFF_DECODER static void draw_slice(HYuvContext *s, int y){ int h, cy; int offset[4]; @@ -1198,7 +1198,7 @@ return (get_bits_count(&s->gb)+31)/32*4 + table_size; } -#endif /* defined(CONFIG_HUFFYUV_DECODER) || defined(CONFIG_FFVHUFF_DECODER) */ +#endif /* CONFIG_HUFFYUV_DECODER || CONFIG_FFVHUFF_DECODER */ static int common_end(HYuvContext *s){ int i; @@ -1209,7 +1209,7 @@ return 0; } -#if defined(CONFIG_HUFFYUV_DECODER) || defined(CONFIG_FFVHUFF_DECODER) +#if CONFIG_HUFFYUV_DECODER || CONFIG_FFVHUFF_DECODER static av_cold int decode_end(AVCodecContext *avctx) { HYuvContext *s = avctx->priv_data; @@ -1224,9 +1224,9 @@ return 0; } -#endif /* defined(CONFIG_HUFFYUV_DECODER) || defined(CONFIG_FFVHUFF_DECODER) */ +#endif /* CONFIG_HUFFYUV_DECODER || CONFIG_FFVHUFF_DECODER */ -#if defined(CONFIG_HUFFYUV_ENCODER) || defined(CONFIG_FFVHUFF_ENCODER) +#if CONFIG_HUFFYUV_ENCODER || CONFIG_FFVHUFF_ENCODER static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){ HYuvContext *s = avctx->priv_data; AVFrame *pict = data; @@ -1431,9 +1431,9 @@ return 0; } -#endif /* defined(CONFIG_HUFFYUV_ENCODER) || defined(CONFIG_FFVHUFF_ENCODER) */ +#endif /* CONFIG_HUFFYUV_ENCODER || CONFIG_FFVHUFF_ENCODER */ -#ifdef CONFIG_HUFFYUV_DECODER +#if CONFIG_HUFFYUV_DECODER AVCodec huffyuv_decoder = { "huffyuv", CODEC_TYPE_VIDEO, @@ -1449,7 +1449,7 @@ }; #endif -#ifdef CONFIG_FFVHUFF_DECODER +#if CONFIG_FFVHUFF_DECODER AVCodec ffvhuff_decoder = { "ffvhuff", CODEC_TYPE_VIDEO, @@ -1465,7 +1465,7 @@ }; #endif -#ifdef CONFIG_HUFFYUV_ENCODER +#if CONFIG_HUFFYUV_ENCODER AVCodec huffyuv_encoder = { "huffyuv", CODEC_TYPE_VIDEO, @@ -1479,7 +1479,7 @@ }; #endif -#ifdef CONFIG_FFVHUFF_ENCODER +#if CONFIG_FFVHUFF_ENCODER AVCodec ffvhuff_encoder = { "ffvhuff", CODEC_TYPE_VIDEO,
--- a/imgconvert.c Tue Jan 13 21:13:45 2009 +0000 +++ b/imgconvert.c Tue Jan 13 23:44:16 2009 +0000 @@ -34,7 +34,7 @@ #include "dsputil.h" #include "colorspace.h" -#ifdef HAVE_MMX +#if HAVE_MMX #include "x86/mmx.h" #include "x86/dsputil_mmx.h" #endif @@ -2089,7 +2089,7 @@ return 0; } -#ifndef CONFIG_SWSCALE +#if !CONFIG_SWSCALE static uint8_t y_ccir_to_jpeg[256]; static uint8_t y_jpeg_to_ccir[256]; static uint8_t c_ccir_to_jpeg[256]; @@ -2662,7 +2662,7 @@ return ret; } -#ifdef HAVE_MMX +#if HAVE_MMX #define DEINT_INPLACE_LINE_LUM \ movd_m2r(lum_m4[0],mm0);\ movd_m2r(lum_m3[0],mm1);\ @@ -2716,7 +2716,7 @@ const uint8_t *lum, int size) { -#ifndef HAVE_MMX +#if !HAVE_MMX uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; int sum; @@ -2754,7 +2754,7 @@ static void deinterlace_line_inplace(uint8_t *lum_m4, uint8_t *lum_m3, uint8_t *lum_m2, uint8_t *lum_m1, uint8_t *lum, int size) { -#ifndef HAVE_MMX +#if !HAVE_MMX uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; int sum;
--- a/imgresample.c Tue Jan 13 21:13:45 2009 +0000 +++ b/imgresample.c Tue Jan 13 23:44:16 2009 +0000 @@ -29,7 +29,7 @@ #include "imgconvert.h" #include "libswscale/swscale.h" -#ifdef HAVE_ALTIVEC +#if HAVE_ALTIVEC #include "ppc/imgresample_altivec.h" #endif @@ -153,7 +153,7 @@ } } -#ifdef HAVE_MMX +#if HAVE_MMX #include "x86/mmx.h" @@ -340,7 +340,7 @@ } else { n = dst_width; } -#ifdef HAVE_MMX +#if HAVE_MMX if ((mm_flags & FF_MM_MMX) && NB_TAPS == 4) h_resample_fast4_mmx(dst, n, src, src_width, src_start, src_incr, filters); @@ -397,7 +397,7 @@ } /* apply vertical filter */ phase_y = get_phase(src_y); -#ifdef HAVE_MMX +#if HAVE_MMX /* desactivated MMX because loss of precision */ if ((mm_flags & FF_MM_MMX) && NB_TAPS == 4 && 0) v_resample4_mmx(output, owidth, @@ -405,7 +405,7 @@ &s->v_filters[phase_y][0]); else #endif -#ifdef HAVE_ALTIVEC +#if HAVE_ALTIVEC if ((mm_flags & FF_MM_ALTIVEC) && NB_TAPS == 4 && FILTER_BITS <= 6) v_resample16_altivec(output, owidth, s->line_buf + (ring_y - NB_TAPS + 1) * owidth, @@ -732,7 +732,7 @@ } } -#ifdef HAVE_MMX +#if HAVE_MMX int mm_flags; #endif @@ -804,7 +804,7 @@ } /* mmx test */ -#ifdef HAVE_MMX +#if HAVE_MMX av_log(NULL, AV_LOG_INFO, "MMX test\n"); fact = 0.72; xsize = (int)(XSIZE * fact);
--- a/lcldec.c Tue Jan 13 21:13:45 2009 +0000 +++ b/lcldec.c Tue Jan 13 23:44:16 2009 +0000 @@ -45,7 +45,7 @@ #include "bitstream.h" #include "lcl.h" -#ifdef CONFIG_ZLIB +#if CONFIG_ZLIB #include <zlib.h> #endif @@ -65,7 +65,7 @@ unsigned int decomp_size; // Decompression buffer unsigned char* decomp_buf; -#ifdef CONFIG_ZLIB +#if CONFIG_ZLIB z_stream zstream; #endif } LclDecContext; @@ -174,7 +174,7 @@ unsigned char yq, y1q, uq, vq; int uqvq; unsigned int mthread_inlen, mthread_outlen; -#ifdef CONFIG_ZLIB +#if CONFIG_ZLIB int zret; // Zlib return code #endif unsigned int len = buf_size; @@ -235,7 +235,7 @@ } break; case CODEC_ID_ZLIB: -#ifdef CONFIG_ZLIB +#if CONFIG_ZLIB /* Using the original dll with normal compression (-1) and RGB format * gives a file with ZLIB fourcc, but frame is really uncompressed. * To be sure that's true check also frame size */ @@ -524,7 +524,7 @@ c->pic.data[0] = NULL; -#ifdef CONFIG_ZLIB +#if CONFIG_ZLIB // Needed if zlib unused or init aborted before inflateInit memset(&(c->zstream), 0, sizeof(z_stream)); #endif @@ -599,7 +599,7 @@ } break; case CODEC_ID_ZLIB: -#ifdef CONFIG_ZLIB +#if CONFIG_ZLIB switch (c->compression) { case COMP_ZLIB_HISPEED: av_log(avctx, AV_LOG_INFO, "High speed compression.\n"); @@ -648,7 +648,7 @@ /* If needed init zlib */ if (avctx->codec_id == CODEC_ID_ZLIB) { -#ifdef CONFIG_ZLIB +#if CONFIG_ZLIB c->zstream.zalloc = Z_NULL; c->zstream.zfree = Z_NULL; c->zstream.opaque = Z_NULL; @@ -679,14 +679,14 @@ if (c->pic.data[0]) avctx->release_buffer(avctx, &c->pic); -#ifdef CONFIG_ZLIB +#if CONFIG_ZLIB inflateEnd(&(c->zstream)); #endif return 0; } -#ifdef CONFIG_MSZH_DECODER +#if CONFIG_MSZH_DECODER AVCodec mszh_decoder = { "mszh", CODEC_TYPE_VIDEO, @@ -701,7 +701,7 @@ }; #endif -#ifdef CONFIG_ZLIB_DECODER +#if CONFIG_ZLIB_DECODER AVCodec zlib_decoder = { "zlib", CODEC_TYPE_VIDEO,
--- a/lclenc.c Tue Jan 13 21:13:45 2009 +0000 +++ b/lclenc.c Tue Jan 13 23:44:16 2009 +0000 @@ -45,7 +45,7 @@ #include "bitstream.h" #include "lcl.h" -#ifdef CONFIG_ZLIB +#if CONFIG_ZLIB #include <zlib.h> #endif @@ -70,7 +70,7 @@ unsigned int max_comp_size; // Compression buffer unsigned char* comp_buf; -#ifdef CONFIG_ZLIB +#if CONFIG_ZLIB z_stream zstream; #endif } LclEncContext; @@ -87,7 +87,7 @@ int i; int zret; // Zlib return code -#ifndef CONFIG_ZLIB +#if !CONFIG_ZLIB av_log(avctx, AV_LOG_ERROR, "Zlib support not compiled in.\n"); return -1; #else @@ -144,7 +144,7 @@ LclEncContext *c = avctx->priv_data; int zret; // Zlib return code -#ifndef CONFIG_ZLIB +#if !CONFIG_ZLIB av_log(avctx, AV_LOG_ERROR, "Zlib support not compiled.\n"); return 1; #else @@ -213,7 +213,7 @@ av_freep(&avctx->extradata); av_freep(&c->comp_buf); -#ifdef CONFIG_ZLIB +#if CONFIG_ZLIB deflateEnd(&(c->zstream)); #endif
--- a/libamr.c Tue Jan 13 21:13:45 2009 +0000 +++ b/libamr.c Tue Jan 13 23:44:16 2009 +0000 @@ -65,7 +65,7 @@ #include "avcodec.h" -#ifdef CONFIG_LIBAMR_NB_FIXED +#if CONFIG_LIBAMR_NB_FIXED #define MMS_IO @@ -137,7 +137,7 @@ avctx->sample_fmt = SAMPLE_FMT_S16; } -#ifdef CONFIG_LIBAMR_NB_FIXED +#if CONFIG_LIBAMR_NB_FIXED /* fixed point version*/ /* frame size in serial bitstream file (frame type + serial stream + flags) */ #define SERIAL_FRAMESIZE (1+MAX_SERIAL_SIZE+5) @@ -353,7 +353,7 @@ } -#elif defined(CONFIG_LIBAMR_NB) /* Float point version*/ +#elif CONFIG_LIBAMR_NB /* Float point version*/ typedef struct AMRContext { int frameCount; @@ -492,7 +492,7 @@ #endif -#if defined(CONFIG_LIBAMR_NB) || defined(CONFIG_LIBAMR_NB_FIXED) +#if CONFIG_LIBAMR_NB || CONFIG_LIBAMR_NB_FIXED AVCodec libamr_nb_decoder = { @@ -524,7 +524,7 @@ #endif /* -----------AMR wideband ------------*/ -#ifdef CONFIG_LIBAMR_WB +#if CONFIG_LIBAMR_WB #ifdef _TYPEDEF_H //To avoid duplicate typedefs from typedef in amr-nb
--- a/libdirac.h Tue Jan 13 21:13:45 2009 +0000 +++ b/libdirac.h Tue Jan 13 23:44:16 2009 +0000 @@ -28,7 +28,7 @@ #include "config.h" -#ifdef CONFIG_LIBDIRAC +#if CONFIG_LIBDIRAC #include "avcodec.h" #include <libdirac_common/dirac_types.h>
--- a/libfaad.c Tue Jan 13 21:13:45 2009 +0000 +++ b/libfaad.c Tue Jan 13 23:44:16 2009 +0000 @@ -35,12 +35,13 @@ #endif /* - * when CONFIG_LIBFAADBIN is defined the libfaad will be opened at runtime + * when CONFIG_LIBFAADBIN is true libfaad will be opened at runtime */ //#undef CONFIG_LIBFAADBIN -//#define CONFIG_LIBFAADBIN +//#define CONFIG_LIBFAADBIN 0 +//#define CONFIG_LIBFAADBIN 1 -#ifdef CONFIG_LIBFAADBIN +#if CONFIG_LIBFAADBIN #include <dlfcn.h> static const char* const libfaadname = "libfaad.so"; #else @@ -224,7 +225,7 @@ FAACContext *s = avctx->priv_data; faacDecConfigurationPtr faac_cfg; -#ifdef CONFIG_LIBFAADBIN +#if CONFIG_LIBFAADBIN const char* err = 0; s->handle = dlopen(libfaadname, RTLD_LAZY); @@ -259,7 +260,7 @@ #undef dfaac -#ifdef CONFIG_LIBFAADBIN +#if CONFIG_LIBFAADBIN if (err) { dlclose(s->handle); av_log(avctx, AV_LOG_ERROR, "FAAD library: cannot resolve %s in %s!\n",
--- a/libschroedinger.h Tue Jan 13 21:13:45 2009 +0000 +++ b/libschroedinger.h Tue Jan 13 23:44:16 2009 +0000 @@ -28,7 +28,7 @@ #include "config.h" -#ifdef CONFIG_LIBSCHROEDINGER +#if CONFIG_LIBSCHROEDINGER #include <schroedinger/schrobitstream.h> #include <schroedinger/schroframe.h>
--- a/libxvidff.c Tue Jan 13 21:13:45 2009 +0000 +++ b/libxvidff.c Tue Jan 13 23:44:16 2009 +0000 @@ -166,9 +166,9 @@ xvid_gbl_init.version = XVID_VERSION; xvid_gbl_init.debug = 0; -#ifdef ARCH_PPC +#if ARCH_PPC /* Xvid's PPC support is borked, use libavcodec to detect */ -#ifdef HAVE_ALTIVEC +#if HAVE_ALTIVEC if( has_altivec() ) { xvid_gbl_init.cpu_flags = XVID_CPU_FORCE | XVID_CPU_ALTIVEC; } else
--- a/mathops.h Tue Jan 13 21:13:45 2009 +0000 +++ b/mathops.h Tue Jan 13 23:44:16 2009 +0000 @@ -24,19 +24,19 @@ #include "libavutil/common.h" -#ifdef ARCH_X86_32 +#if ARCH_X86_32 #include "x86/mathops.h" -#elif defined(ARCH_ARM) +#elif ARCH_ARM #include "arm/mathops.h" -#elif defined(ARCH_PPC) +#elif ARCH_PPC #include "ppc/mathops.h" -#elif defined(ARCH_BFIN) +#elif ARCH_BFIN #include "bfin/mathops.h"
--- a/mpc.c Tue Jan 13 21:13:45 2009 +0000 +++ b/mpc.c Tue Jan 13 23:44:16 2009 +0000 @@ -30,7 +30,7 @@ #include "bitstream.h" #include "dsputil.h" -#ifdef CONFIG_MPEGAUDIO_HP +#if CONFIG_MPEGAUDIO_HP #define USE_HIGHPRECISION #endif #include "mpegaudio.h"
--- a/mpc.h Tue Jan 13 21:13:45 2009 +0000 +++ b/mpc.h Tue Jan 13 23:44:16 2009 +0000 @@ -33,7 +33,7 @@ #include "bitstream.h" #include "dsputil.h" -#ifdef CONFIG_MPEGAUDIO_HP +#if CONFIG_MPEGAUDIO_HP #define USE_HIGHPRECISION #endif #include "mpegaudio.h"
--- a/mpc7.c Tue Jan 13 21:13:45 2009 +0000 +++ b/mpc7.c Tue Jan 13 23:44:16 2009 +0000 @@ -30,7 +30,7 @@ #include "bitstream.h" #include "dsputil.h" -#ifdef CONFIG_MPEGAUDIO_HP +#if CONFIG_MPEGAUDIO_HP #define USE_HIGHPRECISION #endif #include "mpegaudio.h"
--- a/mpc8.c Tue Jan 13 21:13:45 2009 +0000 +++ b/mpc8.c Tue Jan 13 23:44:16 2009 +0000 @@ -30,7 +30,7 @@ #include "bitstream.h" #include "dsputil.h" -#ifdef CONFIG_MPEGAUDIO_HP +#if CONFIG_MPEGAUDIO_HP #define USE_HIGHPRECISION #endif #include "mpegaudio.h"
--- a/mpeg12.c Tue Jan 13 21:13:45 2009 +0000 +++ b/mpeg12.c Tue Jan 13 23:44:16 2009 +0000 @@ -303,7 +303,7 @@ }else memset(s->last_mv, 0, sizeof(s->last_mv)); /* reset mv prediction */ s->mb_intra = 1; -#ifdef CONFIG_XVMC +#if CONFIG_XVMC //if 1, we memcpy blocks in xvmcvideo if(s->avctx->xvmc_acceleration > 1){ XVMC_pack_pblocks(s,-1);//inter are always full blocks @@ -516,7 +516,7 @@ return -1; } -#ifdef CONFIG_XVMC +#if CONFIG_XVMC //if 1, we memcpy blocks in xvmcvideo if(s->avctx->xvmc_acceleration > 1){ XVMC_pack_pblocks(s,cbp); @@ -1644,7 +1644,7 @@ } } } -#ifdef CONFIG_XVMC +#if CONFIG_XVMC // MPV_frame_start will call this function too, // but we need to call it on every field if(s->avctx->xvmc_acceleration) @@ -1735,7 +1735,7 @@ } for(;;) { -#ifdef CONFIG_XVMC +#if CONFIG_XVMC //If 1, we memcpy blocks in xvmcvideo. if(s->avctx->xvmc_acceleration > 1) XVMC_init_block(s);//set s->block @@ -1917,7 +1917,7 @@ if (!s1->mpeg_enc_ctx_allocated || !s->current_picture_ptr) return 0; -#ifdef CONFIG_XVMC +#if CONFIG_XVMC if(s->avctx->xvmc_acceleration) XVMC_field_end(s); #endif @@ -2473,7 +2473,7 @@ .long_name= NULL_IF_CONFIG_SMALL("MPEG-1 video"), }; -#ifdef CONFIG_XVMC +#if CONFIG_XVMC static av_cold int mpeg_mc_decode_init(AVCodecContext *avctx){ Mpeg1Context *s;
--- a/mpegaudiodec.c Tue Jan 13 21:13:45 2009 +0000 +++ b/mpegaudiodec.c Tue Jan 13 23:44:16 2009 +0000 @@ -36,7 +36,7 @@ /* define USE_HIGHPRECISION to have a bit exact (but slower) mpeg audio decoder */ -#ifdef CONFIG_MPEGAUDIO_HP +#if CONFIG_MPEGAUDIO_HP # define USE_HIGHPRECISION #endif @@ -2322,7 +2322,7 @@ s->last_buf_size= 0; } -#ifdef CONFIG_MP3ADU_DECODER +#if CONFIG_MP3ADU_DECODER static int decode_frame_adu(AVCodecContext * avctx, void *data, int *data_size, const uint8_t * buf, int buf_size) @@ -2372,7 +2372,7 @@ } #endif /* CONFIG_MP3ADU_DECODER */ -#ifdef CONFIG_MP3ON4_DECODER +#if CONFIG_MP3ON4_DECODER /** * Context for MP3On4 decoder @@ -2534,7 +2534,7 @@ } #endif /* CONFIG_MP3ON4_DECODER */ -#ifdef CONFIG_MP1_DECODER +#if CONFIG_MP1_DECODER AVCodec mp1_decoder = { "mp1", @@ -2550,7 +2550,7 @@ .long_name= NULL_IF_CONFIG_SMALL("MP1 (MPEG audio layer 1)"), }; #endif -#ifdef CONFIG_MP2_DECODER +#if CONFIG_MP2_DECODER AVCodec mp2_decoder = { "mp2", @@ -2566,7 +2566,7 @@ .long_name= NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"), }; #endif -#ifdef CONFIG_MP3_DECODER +#if CONFIG_MP3_DECODER AVCodec mp3_decoder = { "mp3", @@ -2582,7 +2582,7 @@ .long_name= NULL_IF_CONFIG_SMALL("MP3 (MPEG audio layer 3)"), }; #endif -#ifdef CONFIG_MP3ADU_DECODER +#if CONFIG_MP3ADU_DECODER AVCodec mp3adu_decoder = { "mp3adu", @@ -2598,7 +2598,7 @@ .long_name= NULL_IF_CONFIG_SMALL("ADU (Application Data Unit) MP3 (MPEG audio layer 3)"), }; #endif -#ifdef CONFIG_MP3ON4_DECODER +#if CONFIG_MP3ON4_DECODER AVCodec mp3on4_decoder = { "mp3on4",
--- a/mpegvideo.c Tue Jan 13 21:13:45 2009 +0000 +++ b/mpegvideo.c Tue Jan 13 23:44:16 2009 +0000 @@ -121,19 +121,19 @@ s->dct_unquantize_mpeg2_intra = dct_unquantize_mpeg2_intra_bitexact; s->dct_unquantize_mpeg2_inter = dct_unquantize_mpeg2_inter_c; -#if defined(HAVE_MMX) +#if HAVE_MMX MPV_common_init_mmx(s); -#elif defined(ARCH_ALPHA) +#elif ARCH_ALPHA MPV_common_init_axp(s); -#elif defined(CONFIG_MLIB) +#elif CONFIG_MLIB MPV_common_init_mlib(s); -#elif defined(HAVE_MMI) +#elif HAVE_MMI MPV_common_init_mmi(s); -#elif defined(ARCH_ARM) +#elif ARCH_ARM MPV_common_init_arm(s); -#elif defined(HAVE_ALTIVEC) +#elif HAVE_ALTIVEC MPV_common_init_altivec(s); -#elif defined(ARCH_BFIN) +#elif ARCH_BFIN MPV_common_init_bfin(s); #endif @@ -939,7 +939,7 @@ update_noise_reduction(s); } -#ifdef CONFIG_XVMC +#if CONFIG_XVMC if(s->avctx->xvmc_acceleration) return XVMC_field_start(s, avctx); #endif @@ -951,7 +951,7 @@ { int i; /* draw edge for correct motion prediction if outside */ -#ifdef CONFIG_XVMC +#if CONFIG_XVMC //just to make sure that all data is rendered. if(s->avctx->xvmc_acceleration){ XVMC_field_end(s); @@ -1736,7 +1736,7 @@ { int mb_x, mb_y; const int mb_xy = s->mb_y * s->mb_stride + s->mb_x; -#ifdef CONFIG_XVMC +#if CONFIG_XVMC if(s->avctx->xvmc_acceleration){ XVMC_decode_mb(s);//xvmc uses pblocks return; @@ -1974,7 +1974,7 @@ } void MPV_decode_mb(MpegEncContext *s, DCTELEM block[12][64]){ -#ifndef CONFIG_SMALL +#if !CONFIG_SMALL if(s->out_format == FMT_MPEG1) { if(s->avctx->lowres) MPV_decode_mb_internal(s, block, 1, 1); else MPV_decode_mb_internal(s, block, 0, 1);
--- a/mpegvideo_common.h Tue Jan 13 21:13:45 2009 +0000 +++ b/mpegvideo_common.h Tue Jan 13 23:44:16 2009 +0000 @@ -371,7 +371,7 @@ uint8_t **ref_picture, op_pixels_func (*pix_op)[4], int motion_x, int motion_y, int h) { -#ifndef CONFIG_SMALL +#if !CONFIG_SMALL if(s->out_format == FMT_MPEG1) mpeg_motion_internal(s, dest_y, dest_cb, dest_cr, field_based, bottom_field, field_select, ref_picture, pix_op, @@ -888,7 +888,7 @@ op_pixels_func (*pix_op)[4], qpel_mc_func (*qpix_op)[16]) { -#ifndef CONFIG_SMALL +#if !CONFIG_SMALL if(s->out_format == FMT_MPEG1) MPV_motion_internal(s, dest_y, dest_cb, dest_cr, dir, ref_picture, pix_op, qpix_op, 1);
--- a/msmpeg4.c Tue Jan 13 21:13:45 2009 +0000 +++ b/msmpeg4.c Tue Jan 13 23:44:16 2009 +0000 @@ -62,7 +62,7 @@ static int msmpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr); static void init_h263_dc_for_msmpeg4(void); static inline void msmpeg4_memsetw(short *tab, int val, int n); -#ifdef CONFIG_ENCODERS +#if CONFIG_ENCODERS static void msmpeg4v2_encode_motion(MpegEncContext * s, int val); static int get_size_of_code(MpegEncContext * s, RLTable *rl, int last, int run, int level, int intra); #endif //CONFIG_ENCODERS @@ -79,7 +79,7 @@ #include "msmpeg4data.h" -#ifdef CONFIG_ENCODERS //strangely gcc includes this even if it is not references +#if CONFIG_ENCODERS //strangely gcc includes this even if it is not referenced static uint8_t rl_length[NB_RL_TABLES][MAX_LEVEL+1][MAX_RUN+1][2]; #endif //CONFIG_ENCODERS @@ -109,7 +109,7 @@ s->y_dc_scale_table= wmv1_y_dc_scale_table; s->c_dc_scale_table= wmv1_c_dc_scale_table; break; -#if defined(CONFIG_WMV3_DECODER)||defined(CONFIG_VC1_DECODER) +#if CONFIG_WMV3_DECODER || CONFIG_VC1_DECODER case 6: s->y_dc_scale_table= wmv3_dc_scale_table; s->c_dc_scale_table= wmv3_dc_scale_table; @@ -134,7 +134,7 @@ } } -#ifdef CONFIG_ENCODERS +#if CONFIG_ENCODERS /* build the table which associate a (x,y) motion vector to a vlc */ static void init_mv_table(MVTable *tab) @@ -411,7 +411,7 @@ return pred; } -#ifdef CONFIG_ENCODERS +#if CONFIG_ENCODERS void ff_msmpeg4_encode_motion(MpegEncContext * s, int mx, int my) @@ -653,7 +653,7 @@ necessitate to modify mpegvideo.c. The problem comes from the fact they decided to store the quantized DC (which would lead to problems if Q could vary !) */ -#if (defined(ARCH_X86)) && !defined PIC +#if ARCH_X86 && !defined PIC __asm__ volatile( "movl %3, %%eax \n\t" "shrl $1, %%eax \n\t" @@ -673,7 +673,7 @@ : "%eax", "%edx" ); #else - /* #elif defined (ARCH_ALPHA) */ + /* #elif ARCH_ALPHA */ /* Divisions are extremely costly on Alpha; optimize the most common case. But they are costly everywhere... */ @@ -1362,7 +1362,7 @@ tab[i] = val; } -#ifdef CONFIG_ENCODERS +#if CONFIG_ENCODERS static void msmpeg4v2_encode_motion(MpegEncContext * s, int val) { int range, bit_size, sign, code, bits;
--- a/options.c Tue Jan 13 21:13:45 2009 +0000 +++ b/options.c Tue Jan 13 23:44:16 2009 +0000 @@ -267,7 +267,7 @@ {"vsad", "sum of absolute vertical differences", 0, FF_OPT_TYPE_CONST, FF_CMP_VSAD, INT_MIN, INT_MAX, V|E, "cmp_func"}, {"vsse","sum of squared vertical differences", 0, FF_OPT_TYPE_CONST, FF_CMP_VSSE, INT_MIN, INT_MAX, V|E, "cmp_func"}, {"nsse", "noise preserving sum of squared differences", 0, FF_OPT_TYPE_CONST, FF_CMP_NSSE, INT_MIN, INT_MAX, V|E, "cmp_func"}, -#ifdef CONFIG_SNOW_ENCODER +#if CONFIG_SNOW_ENCODER {"w53", "5/3 wavelet, only used in snow", 0, FF_OPT_TYPE_CONST, FF_CMP_W53, INT_MIN, INT_MAX, V|E, "cmp_func"}, {"w97", "9/7 wavelet, only used in snow", 0, FF_OPT_TYPE_CONST, FF_CMP_W97, INT_MIN, INT_MAX, V|E, "cmp_func"}, #endif
--- a/pcm.c Tue Jan 13 21:13:45 2009 +0000 +++ b/pcm.c Tue Jan 13 23:44:16 2009 +0000 @@ -507,7 +507,7 @@ return src - buf; } -#ifdef CONFIG_ENCODERS +#if CONFIG_ENCODERS #define PCM_ENCODER(id,sample_fmt_,name,long_name_) \ AVCodec name ## _encoder = { \ #name, \ @@ -525,7 +525,7 @@ #define PCM_ENCODER(id,sample_fmt_,name,long_name_) #endif -#ifdef CONFIG_DECODERS +#if CONFIG_DECODERS #define PCM_DECODER(id,sample_fmt_,name,long_name_) \ AVCodec name ## _decoder = { \ #name, \
--- a/pnmenc.c Tue Jan 13 21:13:45 2009 +0000 +++ b/pnmenc.c Tue Jan 13 23:44:16 2009 +0000 @@ -354,7 +354,7 @@ #endif -#ifdef CONFIG_PGM_ENCODER +#if CONFIG_PGM_ENCODER AVCodec pgm_encoder = { "pgm", CODEC_TYPE_VIDEO, @@ -369,7 +369,7 @@ }; #endif // CONFIG_PGM_ENCODER -#ifdef CONFIG_PGMYUV_ENCODER +#if CONFIG_PGMYUV_ENCODER AVCodec pgmyuv_encoder = { "pgmyuv", CODEC_TYPE_VIDEO, @@ -384,7 +384,7 @@ }; #endif // CONFIG_PGMYUV_ENCODER -#ifdef CONFIG_PPM_ENCODER +#if CONFIG_PPM_ENCODER AVCodec ppm_encoder = { "ppm", CODEC_TYPE_VIDEO, @@ -399,7 +399,7 @@ }; #endif // CONFIG_PPM_ENCODER -#ifdef CONFIG_PBM_ENCODER +#if CONFIG_PBM_ENCODER AVCodec pbm_encoder = { "pbm", CODEC_TYPE_VIDEO, @@ -414,7 +414,7 @@ }; #endif // CONFIG_PBM_ENCODER -#ifdef CONFIG_PAM_ENCODER +#if CONFIG_PAM_ENCODER AVCodec pam_encoder = { "pam", CODEC_TYPE_VIDEO,
--- a/ppc/dsputil_ppc.c Tue Jan 13 21:13:45 2009 +0000 +++ b/ppc/dsputil_ppc.c Tue Jan 13 23:44:16 2009 +0000 @@ -24,7 +24,7 @@ #include "dsputil_ppc.h" -#ifdef HAVE_ALTIVEC +#if HAVE_ALTIVEC #include "dsputil_altivec.h" void fdct_altivec(int16_t *block); @@ -48,7 +48,7 @@ int mm_support(void) { int result = 0; -#ifdef HAVE_ALTIVEC +#if HAVE_ALTIVEC if (has_altivec()) { result |= FF_MM_ALTIVEC; } @@ -56,7 +56,7 @@ return result; } -#ifdef CONFIG_POWERPC_PERF +#if CONFIG_POWERPC_PERF unsigned long long perfdata[POWERPC_NUM_PMC_ENABLED][powerpc_perf_total][powerpc_data_total]; /* list below must match enum in dsputil_ppc.h */ static unsigned char* perfname[] = { @@ -91,7 +91,7 @@ #include <stdio.h> #endif -#ifdef CONFIG_POWERPC_PERF +#if CONFIG_POWERPC_PERF void powerpc_display_perf_report(void) { int i, j; @@ -165,7 +165,7 @@ /* same as above, when dcbzl clear a whole 128B cache line i.e. the PPC970 aka G5 */ -#ifdef HAVE_DCBZL +#if HAVE_DCBZL void clear_blocks_dcbz128_ppc(DCTELEM *blocks) { POWERPC_PERF_DECLARE(powerpc_clear_blocks_dcbz128, 1); @@ -195,7 +195,7 @@ } #endif -#ifdef HAVE_DCBZL +#if HAVE_DCBZL /* check dcbz report how many bytes are set to 0 by dcbz */ /* update 24/06/2003 : replace dcbz by dcbzl to get the intended effect (Apple "fixed" dcbz) @@ -261,7 +261,7 @@ break; } -#ifdef HAVE_ALTIVEC +#if HAVE_ALTIVEC if(ENABLE_H264_DECODER) dsputil_h264_init_ppc(c, avctx); if (has_altivec()) { @@ -275,7 +275,7 @@ int_init_altivec(c, avctx); c->gmc1 = gmc1_altivec; -#ifdef CONFIG_ENCODERS +#if CONFIG_ENCODERS if (avctx->dct_algo == FF_DCT_AUTO || avctx->dct_algo == FF_DCT_ALTIVEC) { c->fdct = fdct_altivec; @@ -291,7 +291,7 @@ } } -#ifdef CONFIG_POWERPC_PERF +#if CONFIG_POWERPC_PERF { int i, j; for (i = 0 ; i < powerpc_perf_total ; i++) {
--- a/ppc/dsputil_ppc.h Tue Jan 13 21:13:45 2009 +0000 +++ b/ppc/dsputil_ppc.h Tue Jan 13 23:44:16 2009 +0000 @@ -21,7 +21,7 @@ #ifndef AVCODEC_PPC_DSPUTIL_PPC_H #define AVCODEC_PPC_DSPUTIL_PPC_H -#ifdef CONFIG_POWERPC_PERF +#if CONFIG_POWERPC_PERF void powerpc_display_perf_report(void); /* the 604* have 2, the G3* have 4, the G4s have 6, and the G5 are completely different (they MUST use @@ -68,7 +68,7 @@ }; extern unsigned long long perfdata[POWERPC_NUM_PMC_ENABLED][powerpc_perf_total][powerpc_data_total]; -#ifndef HAVE_PPC64 +#if !HAVE_PPC64 #define POWERP_PMC_DATATYPE unsigned long #define POWERPC_GET_PMC1(a) __asm__ volatile("mfspr %0, 937" : "=r" (a)) #define POWERPC_GET_PMC2(a) __asm__ volatile("mfspr %0, 938" : "=r" (a))
--- a/ppc/gcc_fixes.h Tue Jan 13 21:13:45 2009 +0000 +++ b/ppc/gcc_fixes.h Tue Jan 13 23:44:16 2009 +0000 @@ -25,7 +25,7 @@ #include "config.h" -#ifdef HAVE_ALTIVEC_H +#if HAVE_ALTIVEC_H #include <altivec.h> #endif
--- a/ppc/idct_altivec.c Tue Jan 13 21:13:45 2009 +0000 +++ b/ppc/idct_altivec.c Tue Jan 13 23:44:16 2009 +0000 @@ -161,7 +161,7 @@ POWERPC_PERF_DECLARE(altivec_idct_put_num, 1); vec_u8 tmp; -#ifdef CONFIG_POWERPC_PERF +#if CONFIG_POWERPC_PERF POWERPC_PERF_START_COUNT(altivec_idct_put_num, 1); #endif IDCT @@ -192,7 +192,7 @@ vec_u8 perm1; vec_u8 p0, p1, p; -#ifdef CONFIG_POWERPC_PERF +#if CONFIG_POWERPC_PERF POWERPC_PERF_START_COUNT(altivec_idct_add_num, 1); #endif
--- a/ppc/mathops.h Tue Jan 13 21:13:45 2009 +0000 +++ b/ppc/mathops.h Tue Jan 13 23:44:16 2009 +0000 @@ -23,7 +23,7 @@ #ifndef AVCODEC_PPC_MATHOPS_H #define AVCODEC_PPC_MATHOPS_H -#if defined(ARCH_PPC_405) +#if ARCH_PPC_405 /* signed 16x16 -> 32 multiply add accumulate */ #define MAC16(rt, ra, rb) \ __asm__ ("maclhw %0, %2, %3" : "=r" (rt) : "0" (rt), "r" (ra), "r" (rb));
--- a/ppc/util_altivec.h Tue Jan 13 21:13:45 2009 +0000 +++ b/ppc/util_altivec.h Tue Jan 13 23:44:16 2009 +0000 @@ -28,7 +28,7 @@ #include "config.h" -#ifdef HAVE_ALTIVEC_H +#if HAVE_ALTIVEC_H #include <altivec.h> #endif
--- a/qdm2.c Tue Jan 13 21:13:45 2009 +0000 +++ b/qdm2.c Tue Jan 13 23:44:16 2009 +0000 @@ -39,7 +39,7 @@ #include "bitstream.h" #include "dsputil.h" -#ifdef CONFIG_MPEGAUDIO_HP +#if CONFIG_MPEGAUDIO_HP #define USE_HIGHPRECISION #endif
--- a/ratecontrol.c Tue Jan 13 21:13:45 2009 +0000 +++ b/ratecontrol.c Tue Jan 13 23:44:16 2009 +0000 @@ -184,7 +184,7 @@ //FIXME maybe move to end if((s->flags&CODEC_FLAG_PASS2) && s->avctx->rc_strategy == FF_RC_STRATEGY_XVID) { -#ifdef CONFIG_LIBXVID +#if CONFIG_LIBXVID return ff_xvid_rate_control_init(s); #else av_log(s->avctx, AV_LOG_ERROR, "Xvid ratecontrol requires libavcodec compiled with Xvid support.\n"); @@ -260,7 +260,7 @@ ff_eval_free(rcc->rc_eq_eval); av_freep(&rcc->entry); -#ifdef CONFIG_LIBXVID +#if CONFIG_LIBXVID if((s->flags&CODEC_FLAG_PASS2) && s->avctx->rc_strategy == FF_RC_STRATEGY_XVID) ff_xvid_rate_control_uninit(s); #endif @@ -678,7 +678,7 @@ Picture * const pic= &s->current_picture; emms_c(); -#ifdef CONFIG_LIBXVID +#if CONFIG_LIBXVID if((s->flags&CODEC_FLAG_PASS2) && s->avctx->rc_strategy == FF_RC_STRATEGY_XVID) return ff_xvid_rate_estimate_qscale(s, dry_run); #endif
--- a/rectangle.h Tue Jan 13 21:13:45 2009 +0000 +++ b/rectangle.h Tue Jan 13 23:44:16 2009 +0000 @@ -64,7 +64,7 @@ *(uint32_t*)(p + 3*stride)= v; }else if(w==8){ //gcc can't optimize 64bit math on x86_32 -#ifdef HAVE_FAST_64BIT +#if HAVE_FAST_64BIT const uint64_t v= val*0x0100000001ULL; *(uint64_t*)(p + 0*stride)= v; if(h==1) return;
--- a/rv10.c Tue Jan 13 21:13:45 2009 +0000 +++ b/rv10.c Tue Jan 13 23:44:16 2009 +0000 @@ -230,7 +230,7 @@ } -#if defined(CONFIG_RV10_ENCODER) || defined(CONFIG_RV20_ENCODER) +#if CONFIG_RV10_ENCODER || CONFIG_RV20_ENCODER /* write RV 1.0 compatible frame header */ void rv10_encode_picture_header(MpegEncContext *s, int picture_number) { @@ -304,7 +304,7 @@ } #endif -#endif /* defined(CONFIG_RV10_ENCODER) || defined(CONFIG_RV20_ENCODER) */ +#endif /* CONFIG_RV10_ENCODER || CONFIG_RV20_ENCODER */ /* read RV 1.0 compatible frame header */ static int rv10_decode_picture_header(MpegEncContext *s)
--- a/simple_idct.c Tue Jan 13 21:13:45 2009 +0000 +++ b/simple_idct.c Tue Jan 13 23:44:16 2009 +0000 @@ -59,13 +59,13 @@ static inline void idctRowCondDC (DCTELEM * row) { int a0, a1, a2, a3, b0, b1, b2, b3; -#ifdef HAVE_FAST_64BIT +#if HAVE_FAST_64BIT uint64_t temp; #else uint32_t temp; #endif -#ifdef HAVE_FAST_64BIT +#if HAVE_FAST_64BIT #ifdef WORDS_BIGENDIAN #define ROW0_MASK 0xffff000000000000LL #else @@ -127,7 +127,7 @@ b3 = MUL16(W7, row[1]); MAC16(b3, -W5, row[3]); -#ifdef HAVE_FAST_64BIT +#if HAVE_FAST_64BIT temp = ((uint64_t*)row)[1]; #else temp = ((uint32_t*)row)[2] | ((uint32_t*)row)[3];
--- a/snow.c Tue Jan 13 21:13:45 2009 +0000 +++ b/snow.c Tue Jan 13 23:44:16 2009 +0000 @@ -4670,7 +4670,7 @@ .long_name = NULL_IF_CONFIG_SMALL("Snow"), }; -#ifdef CONFIG_SNOW_ENCODER +#if CONFIG_SNOW_ENCODER AVCodec snow_encoder = { "snow", CODEC_TYPE_VIDEO,
--- a/snow.h Tue Jan 13 21:13:45 2009 +0000 +++ b/snow.h Tue Jan 13 23:44:16 2009 +0000 @@ -125,7 +125,7 @@ void ff_snow_horizontal_compose97i(IDWTELEM *b, int width); void ff_snow_inner_add_yblock(const uint8_t *obmc, const int obmc_stride, uint8_t * * block, int b_w, int b_h, int src_x, int src_y, int src_stride, slice_buffer * sb, int add, uint8_t * dst8); -#ifdef CONFIG_SNOW_ENCODER +#if CONFIG_SNOW_ENCODER int w53_32_c(void *v, uint8_t * pix1, uint8_t * pix2, int line_size, int h); int w97_32_c(void *v, uint8_t * pix1, uint8_t * pix2, int line_size, int h); #else
--- a/sonic.c Tue Jan 13 21:13:45 2009 +0000 +++ b/sonic.c Tue Jan 13 23:44:16 2009 +0000 @@ -408,7 +408,7 @@ return x; } -#if defined(CONFIG_SONIC_ENCODER) || defined(CONFIG_SONIC_LS_ENCODER) +#if CONFIG_SONIC_ENCODER || CONFIG_SONIC_LS_ENCODER // Heavily modified Levinson-Durbin algorithm which // copes better with quantization, and calculates the // actual whitened result as it goes. @@ -479,12 +479,12 @@ av_free(state); } -#endif /* defined(CONFIG_SONIC_ENCODER) || defined(CONFIG_SONIC_LS_ENCODER) */ +#endif /* CONFIG_SONIC_ENCODER || CONFIG_SONIC_LS_ENCODER */ static const int samplerate_table[] = { 44100, 22050, 11025, 96000, 48000, 32000, 24000, 16000, 8000 }; -#if defined(CONFIG_SONIC_ENCODER) || defined(CONFIG_SONIC_LS_ENCODER) +#if CONFIG_SONIC_ENCODER || CONFIG_SONIC_LS_ENCODER static inline int code_samplerate(int samplerate) { switch (samplerate) @@ -747,9 +747,9 @@ flush_put_bits(&pb); return (put_bits_count(&pb)+7)/8; } -#endif /* defined(CONFIG_SONIC_ENCODER) || defined(CONFIG_SONIC_LS_ENCODER) */ +#endif /* CONFIG_SONIC_ENCODER || CONFIG_SONIC_LS_ENCODER */ -#ifdef CONFIG_SONIC_DECODER +#if CONFIG_SONIC_DECODER static av_cold int sonic_decode_init(AVCodecContext *avctx) { SonicContext *s = avctx->priv_data; @@ -936,7 +936,7 @@ } #endif /* CONFIG_SONIC_DECODER */ -#ifdef CONFIG_SONIC_ENCODER +#if CONFIG_SONIC_ENCODER AVCodec sonic_encoder = { "sonic", CODEC_TYPE_AUDIO, @@ -950,7 +950,7 @@ }; #endif -#ifdef CONFIG_SONIC_LS_ENCODER +#if CONFIG_SONIC_LS_ENCODER AVCodec sonic_ls_encoder = { "sonicls", CODEC_TYPE_AUDIO, @@ -964,7 +964,7 @@ }; #endif -#ifdef CONFIG_SONIC_DECODER +#if CONFIG_SONIC_DECODER AVCodec sonic_decoder = { "sonic", CODEC_TYPE_AUDIO,
--- a/svq1enc.c Tue Jan 13 21:13:45 2009 +0000 +++ b/svq1enc.c Tue Jan 13 23:44:16 2009 +0000 @@ -119,7 +119,7 @@ #define QUALITY_THRESHOLD 100 #define THRESHOLD_MULTIPLIER 0.6 -#if defined(HAVE_ALTIVEC) +#if HAVE_ALTIVEC #undef vector #endif
--- a/svq3.c Tue Jan 13 21:13:45 2009 +0000 +++ b/svq3.c Tue Jan 13 23:44:16 2009 +0000 @@ -40,7 +40,7 @@ * http://samples.mplayerhq.hu/V-codecs/SVQ3/Vertical400kbit.sorenson3.mov */ -#ifdef CONFIG_ZLIB +#if CONFIG_ZLIB #include <zlib.h> #endif @@ -849,7 +849,7 @@ h->unknown_svq3_flag = get_bits1(&gb); avctx->has_b_frames = !s->low_delay; if (h->unknown_svq3_flag) { -#ifdef CONFIG_ZLIB +#if CONFIG_ZLIB unsigned watermark_width = svq3_get_ue_golomb(&gb); unsigned watermark_height = svq3_get_ue_golomb(&gb); int u1 = svq3_get_ue_golomb(&gb);
--- a/tiff.c Tue Jan 13 21:13:45 2009 +0000 +++ b/tiff.c Tue Jan 13 23:44:16 2009 +0000 @@ -25,7 +25,7 @@ * @author Konstantin Shishkov */ #include "avcodec.h" -#ifdef CONFIG_ZLIB +#if CONFIG_ZLIB #include <zlib.h> #endif #include "lzw.h" @@ -78,7 +78,7 @@ int c, line, pixels, code; const uint8_t *ssrc = src; int width = s->width * s->bpp >> 3; -#ifdef CONFIG_ZLIB +#if CONFIG_ZLIB uint8_t *zbuf; unsigned long outlen; if(s->compr == TIFF_DEFLATE || s->compr == TIFF_ADOBE_DEFLATE){ @@ -298,7 +298,7 @@ break; case TIFF_DEFLATE: case TIFF_ADOBE_DEFLATE: -#ifdef CONFIG_ZLIB +#if CONFIG_ZLIB break; #else av_log(s->avctx, AV_LOG_ERROR, "Deflate: ZLib not compiled in\n");
--- a/tiffenc.c Tue Jan 13 21:13:45 2009 +0000 +++ b/tiffenc.c Tue Jan 13 23:44:16 2009 +0000 @@ -25,7 +25,7 @@ * @author Bartlomiej Wolowiec */ #include "avcodec.h" -#ifdef CONFIG_ZLIB +#if CONFIG_ZLIB #include <zlib.h> #endif #include "bytestream.h" @@ -151,7 +151,7 @@ { switch (compr) { -#ifdef CONFIG_ZLIB +#if CONFIG_ZLIB case TIFF_DEFLATE: case TIFF_ADOBE_DEFLATE: { @@ -229,7 +229,7 @@ s->compr = TIFF_RAW; } else if(avctx->compression_level == 2) { s->compr = TIFF_LZW; -#ifdef CONFIG_ZLIB +#if CONFIG_ZLIB } else if ((avctx->compression_level >= 3)) { s->compr = TIFF_DEFLATE; #endif @@ -315,7 +315,7 @@ } } -#ifdef CONFIG_ZLIB +#if CONFIG_ZLIB if (s->compr == TIFF_DEFLATE || s->compr == TIFF_ADOBE_DEFLATE) { uint8_t *zbuf; int zlen, zn;
--- a/utils.c Tue Jan 13 21:13:45 2009 +0000 +++ b/utils.c Tue Jan 13 23:44:16 2009 +0000 @@ -40,7 +40,7 @@ #include <stdarg.h> #include <limits.h> #include <float.h> -#if !defined(HAVE_MKSTEMP) +#if !HAVE_MKSTEMP #include <fcntl.h> #endif @@ -251,7 +251,7 @@ //we could change STRIDE_ALIGN to 16 for x86/sse but it would increase the //picture size unneccessarily in some cases. The solution here is not //pretty and better ideas are welcome! -#ifdef HAVE_MMX +#if HAVE_MMX if(s->codec_id == CODEC_ID_SVQ1) stride_align[i]= 16; else @@ -900,7 +900,7 @@ } } -#if !defined(HAVE_THREADS) +#if !HAVE_THREADS int avcodec_thread_init(AVCodecContext *s, int thread_count){ return -1; } @@ -927,7 +927,7 @@ * and opened file name in **filename. */ int av_tempfile(char *prefix, char **filename) { int fd=-1; -#if !defined(HAVE_MKSTEMP) +#if !HAVE_MKSTEMP *filename = tempnam(".", prefix); #else size_t len = strlen(prefix) + 12; /* room for "/tmp/" and "XXXXXX\0" */ @@ -938,7 +938,7 @@ av_log(NULL, AV_LOG_ERROR, "ff_tempfile: Cannot allocate file name\n"); return -1; } -#if !defined(HAVE_MKSTEMP) +#if !HAVE_MKSTEMP fd = open(*filename, O_RDWR | O_BINARY | O_CREAT, 0444); #else snprintf(*filename, len, "/tmp/%sXXXXXX", prefix);
--- a/vcr1.c Tue Jan 13 21:13:45 2009 +0000 +++ b/vcr1.c Tue Jan 13 23:44:16 2009 +0000 @@ -32,6 +32,7 @@ /* Disable the encoder. */ #undef CONFIG_VCR1_ENCODER +#define CONFIG_VCR1_ENCODER 0 typedef struct VCR1Context{ AVCodecContext *avctx; @@ -116,7 +117,7 @@ return buf_size; } -#ifdef CONFIG_VCR1_ENCODER +#if CONFIG_VCR1_ENCODER static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){ VCR1Context * const a = avctx->priv_data; AVFrame *pict = data; @@ -156,7 +157,7 @@ return 0; } -#ifdef CONFIG_VCR1_ENCODER +#if CONFIG_VCR1_ENCODER static av_cold int encode_init(AVCodecContext *avctx){ common_init(avctx); @@ -178,7 +179,7 @@ .long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"), }; -#ifdef CONFIG_VCR1_ENCODER +#if CONFIG_VCR1_ENCODER AVCodec vcr1_encoder = { "vcr1", CODEC_TYPE_VIDEO,
--- a/vp3.c Tue Jan 13 21:13:45 2009 +0000 +++ b/vp3.c Tue Jan 13 23:44:16 2009 +0000 @@ -2021,7 +2021,7 @@ return 0; } -#ifdef CONFIG_THEORA_DECODER +#if CONFIG_THEORA_DECODER static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb) { Vp3DecodeContext *s = avctx->priv_data;
--- a/x86/cpuid.c Tue Jan 13 21:13:45 2009 +0000 +++ b/x86/cpuid.c Tue Jan 13 23:44:16 2009 +0000 @@ -44,7 +44,7 @@ int max_std_level, max_ext_level, std_caps=0, ext_caps=0; x86_reg a, c; -#ifdef ARCH_X86_64 +#if ARCH_X86_64 #define PUSHF "pushfq\n\t" #define POPF "popfq\n\t" #else @@ -83,7 +83,7 @@ rval |= FF_MM_MMX; if (std_caps & (1<<25)) rval |= FF_MM_MMXEXT -#ifdef HAVE_SSE +#if HAVE_SSE | FF_MM_SSE; if (std_caps & (1<<26)) rval |= FF_MM_SSE2;
--- a/x86/dsputil_mmx.c Tue Jan 13 21:13:45 2009 +0000 +++ b/x86/dsputil_mmx.c Tue Jan 13 23:44:16 2009 +0000 @@ -880,7 +880,7 @@ "pabsw %%mm5, %%mm5 \n" PAETH(mmx2, ABS3_MMX2) -#ifdef HAVE_SSSE3 +#if HAVE_SSSE3 PAETH(ssse3, ABS3_SSSE3) #endif @@ -1765,7 +1765,7 @@ /* XXX: those functions should be suppressed ASAP when all IDCTs are converted */ -#ifdef CONFIG_GPL +#if CONFIG_GPL static void ff_libmpeg2mmx_idct_put(uint8_t *dest, int line_size, DCTELEM *block) { ff_mmx_idct (block); @@ -2147,7 +2147,7 @@ static void vector_fmul_window_3dnow2(float *dst, const float *src0, const float *src1, const float *win, float add_bias, int len){ -#ifdef HAVE_6REGS +#if HAVE_6REGS if(add_bias == 0){ x86_reg i = -len*4; x86_reg j = len*4-8; @@ -2182,7 +2182,7 @@ static void vector_fmul_window_sse(float *dst, const float *src0, const float *src1, const float *win, float add_bias, int len){ -#ifdef HAVE_6REGS +#if HAVE_6REGS if(add_bias == 0){ x86_reg i = -len*4; x86_reg j = len*4-16; @@ -2324,7 +2324,7 @@ ); } -#ifdef HAVE_YASM +#if HAVE_YASM void ff_float_to_int16_interleave6_sse(int16_t *dst, const float **src, int len); void ff_float_to_int16_interleave6_3dnow(int16_t *dst, const float **src, int len); void ff_float_to_int16_interleave6_3dn2(int16_t *dst, const float **src, int len); @@ -2332,7 +2332,7 @@ void ff_x264_deblock_h_luma_sse2(uint8_t *pix, int stride, int alpha, int beta, int8_t *tc0); void ff_x264_deblock_v8_luma_intra_mmxext(uint8_t *pix, int stride, int alpha, int beta); void ff_x264_deblock_h_luma_intra_mmxext(uint8_t *pix, int stride, int alpha, int beta); -#ifdef ARCH_X86_32 +#if ARCH_X86_32 static void ff_x264_deblock_v_luma_intra_mmxext(uint8_t *pix, int stride, int alpha, int beta) { ff_x264_deblock_v8_luma_intra_mmxext(pix+0, stride, alpha, beta); @@ -2555,7 +2555,7 @@ c->idct_add= ff_simple_idct_add_mmx; c->idct = ff_simple_idct_mmx; c->idct_permutation_type= FF_SIMPLE_IDCT_PERM; -#ifdef CONFIG_GPL +#if CONFIG_GPL }else if(idct_algo==FF_IDCT_LIBMPEG2MMX){ if(mm_flags & FF_MM_MMXEXT){ c->idct_put= ff_libmpeg2mmx2_idct_put; @@ -2853,7 +2853,7 @@ H264_QPEL_FUNCS(3, 2, sse2); H264_QPEL_FUNCS(3, 3, sse2); } -#ifdef HAVE_SSSE3 +#if HAVE_SSSE3 if(mm_flags & FF_MM_SSSE3){ H264_QPEL_FUNCS(1, 0, ssse3); H264_QPEL_FUNCS(1, 1, ssse3); @@ -2876,14 +2876,14 @@ } #endif -#if defined(CONFIG_GPL) && defined(HAVE_YASM) +#if CONFIG_GPL && HAVE_YASM if( mm_flags&FF_MM_MMXEXT ){ -#ifdef ARCH_X86_32 +#if ARCH_X86_32 c->h264_v_loop_filter_luma_intra = ff_x264_deblock_v_luma_intra_mmxext; c->h264_h_loop_filter_luma_intra = ff_x264_deblock_h_luma_intra_mmxext; #endif if( mm_flags&FF_MM_SSE2 ){ -#if defined(ARCH_X86_64) || !defined(__ICC) || __ICC > 1100 +#if ARCH_X86_64 || !defined(__ICC) || __ICC > 1100 c->h264_v_loop_filter_luma = ff_x264_deblock_v_luma_sse2; c->h264_h_loop_filter_luma = ff_x264_deblock_h_luma_sse2; c->h264_v_loop_filter_luma_intra = ff_x264_deblock_v_luma_intra_sse2; @@ -2896,10 +2896,10 @@ } #endif -#ifdef CONFIG_SNOW_DECODER +#if CONFIG_SNOW_DECODER if(mm_flags & FF_MM_SSE2 & 0){ c->horizontal_compose97i = ff_snow_horizontal_compose97i_sse2; -#ifdef HAVE_7REGS +#if HAVE_7REGS c->vertical_compose97i = ff_snow_vertical_compose97i_sse2; #endif c->inner_add_yblock = ff_snow_inner_add_yblock_sse2; @@ -2907,7 +2907,7 @@ else{ if(mm_flags & FF_MM_MMXEXT){ c->horizontal_compose97i = ff_snow_horizontal_compose97i_mmx; -#ifdef HAVE_7REGS +#if HAVE_7REGS c->vertical_compose97i = ff_snow_vertical_compose97i_mmx; #endif }
--- a/x86/dsputil_mmx.h Tue Jan 13 21:13:45 2009 +0000 +++ b/x86/dsputil_mmx.h Tue Jan 13 23:44:16 2009 +0000 @@ -104,7 +104,7 @@ SBUTTERFLY(t, b, c, wd, q) /* t= a2 b2 c2 d2 e2 f2 g2 h2 */\ /* c= a3 b3 c3 d3 e3 f3 g3 h3 */ -#ifdef ARCH_X86_64 +#if ARCH_X86_64 // permutes 01234567 -> 05736421 #define TRANSPOSE8(a,b,c,d,e,f,g,h,t)\ SBUTTERFLY(a,b,%%xmm8,wd,dqa)\
--- a/x86/dsputilenc_mmx.c Tue Jan 13 21:13:45 2009 +0000 +++ b/x86/dsputilenc_mmx.c Tue Jan 13 23:44:16 2009 +0000 @@ -1015,7 +1015,7 @@ MMABS_SUM(%%xmm7, %%xmm9, %%xmm1)\ "paddusw %%xmm1, %%xmm0 \n\t" -#ifdef ARCH_X86_64 +#if ARCH_X86_64 #define MMABS_SUM_8x8_SSE2 MMABS_SUM_8x8_NOSPILL #else #define MMABS_SUM_8x8_SSE2\ @@ -1180,7 +1180,7 @@ #undef MMABS_SUM_8x8 #undef HSUM -#ifdef HAVE_SSSE3 +#if HAVE_SSSE3 #define MMABS(a,z) MMABS_SSSE3(a,z) #define MMABS_SUM_8x8 MMABS_SUM_8x8_NOSPILL HADAMARD8_DIFF_SSE2(ssse3) @@ -1245,7 +1245,7 @@ DCT_SAD_FUNC(sse2) #undef MMABS -#ifdef HAVE_SSSE3 +#if HAVE_SSSE3 #define MMABS(a,z) MMABS_SSSE3(a,z) DCT_SAD_FUNC(ssse3) #undef MMABS @@ -1325,7 +1325,7 @@ #undef SCALE_OFFSET #undef PMULHRW -#ifdef HAVE_SSSE3 +#if HAVE_SSSE3 #undef PHADDD #define DEF(x) x ## _ssse3 #define SET_RND(x) @@ -1417,7 +1417,7 @@ c->flac_compute_autocorr = ff_flac_compute_autocorr_sse2; } -#ifdef HAVE_SSSE3 +#if HAVE_SSSE3 if(mm_flags & FF_MM_SSSE3){ if(!(avctx->flags & CODEC_FLAG_BITEXACT)){ c->try_8x8basis= try_8x8basis_ssse3;
--- a/x86/fft_sse.c Tue Jan 13 21:13:45 2009 +0000 +++ b/x86/fft_sse.c Tue Jan 13 23:44:16 2009 +0000 @@ -108,7 +108,7 @@ ::"r"(-4*k), "r"(4*k), "r"(input+n4), "r"(tcos+n8), "r"(tsin+n8) ); -#ifdef ARCH_X86_64 +#if ARCH_X86_64 // if we have enough regs, don't let gcc make the luts latency-bound // but if not, latency is faster than spilling __asm__("movlps %%xmm0, %0 \n"
--- a/x86/h264_i386.h Tue Jan 13 21:13:45 2009 +0000 +++ b/x86/h264_i386.h Tue Jan 13 23:44:16 2009 +0000 @@ -33,9 +33,7 @@ //FIXME use some macros to avoid duplicating get_cabac (cannot be done yet //as that would make optimization work hard) -#if defined(ARCH_X86) && defined(HAVE_7REGS) && \ - defined(HAVE_EBX_AVAILABLE) && \ - !defined(BROKEN_RELOCATIONS) +#if ARCH_X86 && HAVE_7REGS && HAVE_EBX_AVAILABLE && !defined(BROKEN_RELOCATIONS) static int decode_significance_x86(CABACContext *c, int max_coeff, uint8_t *significant_coeff_ctx_base, int *index){ @@ -149,7 +147,7 @@ ); return coeff_count; } -#endif /* defined(ARCH_X86) && defined(HAVE_7REGS) && */ - /* defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) */ +#endif /* ARCH_X86 && HAVE_7REGS && HAVE_EBX_AVAILABLE */ + /* !defined(BROKEN_RELOCATIONS) */ #endif /* AVCODEC_X86_H264_I386_H */
--- a/x86/h264dsp_mmx.c Tue Jan 13 21:13:45 2009 +0000 +++ b/x86/h264dsp_mmx.c Tue Jan 13 23:44:16 2009 +0000 @@ -472,7 +472,7 @@ } } -#if defined(CONFIG_GPL) && defined(HAVE_YASM) +#if CONFIG_GPL && HAVE_YASM static void ff_h264_idct_dc_add8_mmx2(uint8_t *dst, int16_t *block, int stride) { __asm__ volatile( @@ -1488,7 +1488,7 @@ }\ -#ifdef ARCH_X86_64 +#if ARCH_X86_64 #define QPEL_H264_H16_XMM(OPNAME, OP, MMX)\ static av_noinline void OPNAME ## h264_qpel16_h_lowpass_l2_ ## MMX(uint8_t *dst, uint8_t *src, uint8_t *src2, int dstStride, int src2Stride){\ int h=16;\ @@ -2065,7 +2065,7 @@ QPEL_H264_V_XMM(avg_, AVG_MMX2_OP, sse2) QPEL_H264_HV_XMM(put_, PUT_OP, sse2) QPEL_H264_HV_XMM(avg_, AVG_MMX2_OP, sse2) -#ifdef HAVE_SSSE3 +#if HAVE_SSSE3 QPEL_H264_H_XMM(put_, PUT_OP, ssse3) QPEL_H264_H_XMM(avg_, AVG_MMX2_OP, ssse3) QPEL_H264_HV2_XMM(put_, PUT_OP, ssse3) @@ -2079,7 +2079,7 @@ H264_MC_4816(mmx2) H264_MC_816(H264_MC_V, sse2) H264_MC_816(H264_MC_HV, sse2) -#ifdef HAVE_SSSE3 +#if HAVE_SSSE3 H264_MC_816(H264_MC_H, ssse3) H264_MC_816(H264_MC_HV, ssse3) #endif @@ -2161,7 +2161,7 @@ #undef H264_CHROMA_MC4_TMPL #undef H264_CHROMA_MC8_MV0 -#ifdef HAVE_SSSE3 +#if HAVE_SSSE3 #define AVG_OP(X) #undef H264_CHROMA_MC8_TMPL #undef H264_CHROMA_MC4_TMPL
--- a/x86/idct_sse2_xvid.c Tue Jan 13 21:13:45 2009 +0000 +++ b/x86/idct_sse2_xvid.c Tue Jan 13 23:44:16 2009 +0000 @@ -103,7 +103,7 @@ #define CLEAR_ODD(r) "pxor "r","r" \n\t" #define PUT_ODD(dst) "pshufhw $0x1B, %%xmm2, "dst" \n\t" -#ifdef ARCH_X86_64 +#if ARCH_X86_64 # define ROW0 "%%xmm8" # define REG0 ROW0 @@ -371,7 +371,7 @@ JZ("%%esi", "1f") "5: \n\t" iMTX_MULT("7*16(%0)", MANGLE(iTab2), ROUND(walkenIdctRounders+5*16), PUT_ODD(ROW7)) -#ifndef ARCH_X86_64 +#if !ARCH_X86_64 iLLM_HEAD #endif iLLM_PASS("%0")
--- a/x86/mpegvideo_mmx.c Tue Jan 13 21:13:45 2009 +0000 +++ b/x86/mpegvideo_mmx.c Tue Jan 13 23:44:16 2009 +0000 @@ -583,25 +583,30 @@ ); } -#ifdef HAVE_SSSE3 +#if HAVE_SSSE3 #define HAVE_SSSE3_BAK #endif #undef HAVE_SSSE3 +#define HAVE_SSSE3 0 #undef HAVE_SSE2 #undef HAVE_MMX2 +#define HAVE_SSE2 0 +#define HAVE_MMX2 0 #define RENAME(a) a ## _MMX #define RENAMEl(a) a ## _mmx #include "mpegvideo_mmx_template.c" -#define HAVE_MMX2 +#undef HAVE_MMX2 +#define HAVE_MMX2 1 #undef RENAME #undef RENAMEl #define RENAME(a) a ## _MMX2 #define RENAMEl(a) a ## _mmx2 #include "mpegvideo_mmx_template.c" -#define HAVE_SSE2 +#undef HAVE_SSE2 +#define HAVE_SSE2 1 #undef RENAME #undef RENAMEl #define RENAME(a) a ## _SSE2 @@ -609,7 +614,8 @@ #include "mpegvideo_mmx_template.c" #ifdef HAVE_SSSE3_BAK -#define HAVE_SSSE3 +#undef HAVE_SSSE3 +#define HAVE_SSSE3 1 #undef RENAME #undef RENAMEl #define RENAME(a) a ## _SSSE3 @@ -637,7 +643,7 @@ } if(dct_algo==FF_DCT_AUTO || dct_algo==FF_DCT_MMX){ -#ifdef HAVE_SSSE3 +#if HAVE_SSSE3 if(mm_flags & FF_MM_SSSE3){ s->dct_quantize= dct_quantize_SSSE3; } else
--- a/x86/mpegvideo_mmx_template.c Tue Jan 13 21:13:45 2009 +0000 +++ b/x86/mpegvideo_mmx_template.c Tue Jan 13 23:44:16 2009 +0000 @@ -29,7 +29,7 @@ #undef SAVE_SIGN #undef RESTORE_SIGN -#if defined(HAVE_SSE2) +#if HAVE_SSE2 #define MMREG_WIDTH "16" #define MM "%%xmm" #define MOVQ "movdqa" @@ -48,7 +48,7 @@ #define MMREG_WIDTH "8" #define MM "%%mm" #define MOVQ "movq" -#if defined(HAVE_MMX2) +#if HAVE_MMX2 #define SPREADW(a) "pshufw $0, "a", "a" \n\t" #define PMAXW(a,b) "pmaxsw "a", "b" \n\t" #define PMAX(a,b) \ @@ -74,7 +74,7 @@ #endif #endif -#ifdef HAVE_SSSE3 +#if HAVE_SSSE3 #define SAVE_SIGN(a,b) \ "movdqa "b", "a" \n\t"\ "pabsw "b", "b" \n\t" @@ -219,7 +219,7 @@ SPREADW(MM"1") "psubusw "MM"1, "MM"4 \n\t" "packuswb "MM"4, "MM"4 \n\t" -#ifdef HAVE_SSE2 +#if HAVE_SSE2 "packuswb "MM"4, "MM"4 \n\t" #endif "movd "MM"4, %0 \n\t" // *overflow
--- a/x86/snowdsp_mmx.c Tue Jan 13 21:13:45 2009 +0000 +++ b/x86/snowdsp_mmx.c Tue Jan 13 23:44:16 2009 +0000 @@ -386,7 +386,7 @@ } } -#ifdef HAVE_7REGS +#if HAVE_7REGS #define snow_vertical_compose_sse2_load_add(op,r,t0,t1,t2,t3)\ ""op" ("r",%%"REG_d"), %%"t0" \n\t"\ ""op" 16("r",%%"REG_d"), %%"t1" \n\t"\