diff options
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/alpha/dsputil_alpha.c | 6 | ||||
-rw-r--r-- | libavcodec/armv4l/dsputil_arm.c | 28 | ||||
-rw-r--r-- | libavcodec/armv4l/float_arm_vfp.c | 8 | ||||
-rw-r--r-- | libavcodec/armv4l/mpegvideo_arm.c | 4 | ||||
-rw-r--r-- | libavcodec/armv4l/mpegvideo_armv5te.c | 3 | ||||
-rw-r--r-- | libavcodec/avcodec.h | 2 | ||||
-rw-r--r-- | libavcodec/bfin/dsputil_bfin.c | 58 | ||||
-rw-r--r-- | libavcodec/bfin/mpegvideo_bfin.c | 2 | ||||
-rw-r--r-- | libavcodec/bfin/vp3_bfin.c | 8 | ||||
-rw-r--r-- | libavcodec/celp_math.h | 2 | ||||
-rw-r--r-- | libavcodec/dct-test.c | 20 | ||||
-rw-r--r-- | libavcodec/i386/dsputil_mmx.c | 16 | ||||
-rw-r--r-- | libavcodec/libxvidff.c | 2 | ||||
-rw-r--r-- | libavcodec/mpc.h | 4 | ||||
-rw-r--r-- | libavcodec/mpeg12.c | 8 | ||||
-rw-r--r-- | libavcodec/mpegvideo.c | 6 | ||||
-rw-r--r-- | libavcodec/png.h | 9 | ||||
-rw-r--r-- | libavcodec/ppc/dsputil_altivec.h | 2 | ||||
-rw-r--r-- | libavcodec/ppc/dsputil_ppc.c | 10 | ||||
-rw-r--r-- | libavcodec/ppc/mpegvideo_altivec.c | 4 | ||||
-rw-r--r-- | libavcodec/sh4/dsputil_sh4.c | 4 | ||||
-rw-r--r-- | libavcodec/snow.h | 6 | ||||
-rw-r--r-- | libavcodec/sparc/dsputil_vis.c | 6 |
23 files changed, 106 insertions, 112 deletions
diff --git a/libavcodec/alpha/dsputil_alpha.c b/libavcodec/alpha/dsputil_alpha.c index 6b80731bc9..c1500b11f9 100644 --- a/libavcodec/alpha/dsputil_alpha.c +++ b/libavcodec/alpha/dsputil_alpha.c @@ -22,9 +22,9 @@ #include "libavcodec/dsputil.h" #include "asm.h" -extern void simple_idct_axp(DCTELEM *block); -extern void simple_idct_put_axp(uint8_t *dest, int line_size, DCTELEM *block); -extern void simple_idct_add_axp(uint8_t *dest, int line_size, DCTELEM *block); +void simple_idct_axp(DCTELEM *block); +void simple_idct_put_axp(uint8_t *dest, int line_size, DCTELEM *block); +void simple_idct_add_axp(uint8_t *dest, int line_size, DCTELEM *block); void put_pixels_axp_asm(uint8_t *block, const uint8_t *pixels, int line_size, int h); diff --git a/libavcodec/armv4l/dsputil_arm.c b/libavcodec/armv4l/dsputil_arm.c index 695bf1c2cf..385ef3d4d3 100644 --- a/libavcodec/armv4l/dsputil_arm.c +++ b/libavcodec/armv4l/dsputil_arm.c @@ -24,23 +24,19 @@ #include <ipp.h> #endif -extern void dsputil_init_iwmmxt(DSPContext* c, AVCodecContext *avctx); -extern void ff_float_init_arm_vfp(DSPContext* c, AVCodecContext *avctx); +void dsputil_init_iwmmxt(DSPContext* c, AVCodecContext *avctx); +void ff_float_init_arm_vfp(DSPContext* c, AVCodecContext *avctx); -extern void j_rev_dct_ARM(DCTELEM *data); -extern void simple_idct_ARM(DCTELEM *data); +void j_rev_dct_ARM(DCTELEM *data); +void simple_idct_ARM(DCTELEM *data); -extern void simple_idct_armv5te(DCTELEM *data); -extern void simple_idct_put_armv5te(uint8_t *dest, int line_size, - DCTELEM *data); -extern void simple_idct_add_armv5te(uint8_t *dest, int line_size, - DCTELEM *data); +void simple_idct_armv5te(DCTELEM *data); +void simple_idct_put_armv5te(uint8_t *dest, int line_size, DCTELEM *data); +void simple_idct_add_armv5te(uint8_t *dest, int line_size, DCTELEM *data); -extern void ff_simple_idct_armv6(DCTELEM *data); -extern void ff_simple_idct_put_armv6(uint8_t *dest, int line_size, - DCTELEM *data); -extern void ff_simple_idct_add_armv6(uint8_t *dest, int line_size, - DCTELEM *data); +void ff_simple_idct_armv6(DCTELEM *data); +void ff_simple_idct_put_armv6(uint8_t *dest, int line_size, DCTELEM *data); +void ff_simple_idct_add_armv6(uint8_t *dest, int line_size, DCTELEM *data); /* XXX: local hack */ static void (*ff_put_pixels_clamped)(const DCTELEM *block, uint8_t *pixels, int line_size); @@ -57,7 +53,7 @@ void put_no_rnd_pixels8_xy2_arm(uint8_t *block, const uint8_t *pixels, int line_ void put_pixels16_arm(uint8_t *block, const uint8_t *pixels, int line_size, int h); -extern void ff_prefetch_arm(void *mem, int stride, int h); +void ff_prefetch_arm(void *mem, int stride, int h); CALL_2X_PIXELS(put_pixels16_x2_arm , put_pixels8_x2_arm , 8) CALL_2X_PIXELS(put_pixels16_y2_arm , put_pixels8_y2_arm , 8) @@ -66,7 +62,7 @@ CALL_2X_PIXELS(put_no_rnd_pixels16_x2_arm , put_no_rnd_pixels8_x2_arm , 8) CALL_2X_PIXELS(put_no_rnd_pixels16_y2_arm , put_no_rnd_pixels8_y2_arm , 8) CALL_2X_PIXELS(put_no_rnd_pixels16_xy2_arm, put_no_rnd_pixels8_xy2_arm, 8) -extern void ff_add_pixels_clamped_ARM(short *block, unsigned char *dest, +void ff_add_pixels_clamped_ARM(short *block, unsigned char *dest, int line_size); /* XXX: those functions should be suppressed ASAP when all IDCTs are diff --git a/libavcodec/armv4l/float_arm_vfp.c b/libavcodec/armv4l/float_arm_vfp.c index fb827b3f49..5598aa9c02 100644 --- a/libavcodec/armv4l/float_arm_vfp.c +++ b/libavcodec/armv4l/float_arm_vfp.c @@ -20,10 +20,10 @@ #include "libavcodec/dsputil.h" -extern void ff_vector_fmul_vfp(float *dst, const float *src, int len); -extern void ff_vector_fmul_reverse_vfp(float *dst, const float *src0, - const float *src1, int len); -extern void ff_float_to_int16_vfp(int16_t *dst, const float *src, long len); +void ff_vector_fmul_vfp(float *dst, const float *src, int len); +void ff_vector_fmul_reverse_vfp(float *dst, const float *src0, + const float *src1, int len); +void ff_float_to_int16_vfp(int16_t *dst, const float *src, long len); void ff_float_init_arm_vfp(DSPContext* c, AVCodecContext *avctx) { diff --git a/libavcodec/armv4l/mpegvideo_arm.c b/libavcodec/armv4l/mpegvideo_arm.c index 1a11d7a0fb..657fc03d5a 100644 --- a/libavcodec/armv4l/mpegvideo_arm.c +++ b/libavcodec/armv4l/mpegvideo_arm.c @@ -22,8 +22,8 @@ #include "libavcodec/dsputil.h" #include "libavcodec/mpegvideo.h" -extern void MPV_common_init_iwmmxt(MpegEncContext *s); -extern void MPV_common_init_armv5te(MpegEncContext *s); +void MPV_common_init_iwmmxt(MpegEncContext *s); +void MPV_common_init_armv5te(MpegEncContext *s); void MPV_common_init_armv4l(MpegEncContext *s) { diff --git a/libavcodec/armv4l/mpegvideo_armv5te.c b/libavcodec/armv4l/mpegvideo_armv5te.c index 9e6c324f74..b213cf1de3 100644 --- a/libavcodec/armv4l/mpegvideo_armv5te.c +++ b/libavcodec/armv4l/mpegvideo_armv5te.c @@ -23,8 +23,7 @@ #include "libavcodec/dsputil.h" #include "libavcodec/mpegvideo.h" -extern void ff_dct_unquantize_h263_armv5te(DCTELEM *block, int qmul, int qadd, - int count); +void ff_dct_unquantize_h263_armv5te(DCTELEM *block, int qmul, int qadd, int count); #ifdef ENABLE_ARM_TESTS /** diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 2afcce91db..1ee01c4866 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2972,7 +2972,7 @@ int av_picture_crop(AVPicture *dst, const AVPicture *src, int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width, int pix_fmt, int padtop, int padbottom, int padleft, int padright, int *color); -extern unsigned int av_xiphlacing(unsigned char *s, unsigned int v); +unsigned int av_xiphlacing(unsigned char *s, unsigned int v); /** * Parses \p str and put in \p width_ptr and \p height_ptr the detected values. diff --git a/libavcodec/bfin/dsputil_bfin.c b/libavcodec/bfin/dsputil_bfin.c index ccdb19cec6..1a8ae3b505 100644 --- a/libavcodec/bfin/dsputil_bfin.c +++ b/libavcodec/bfin/dsputil_bfin.c @@ -29,35 +29,35 @@ int off; -extern void ff_bfin_idct (DCTELEM *block) attribute_l1_text; -extern void ff_bfin_fdct (DCTELEM *block) attribute_l1_text; -extern void ff_bfin_vp3_idct (DCTELEM *block); -extern void ff_bfin_vp3_idct_put (uint8_t *dest, int line_size, DCTELEM *block); -extern void ff_bfin_vp3_idct_add (uint8_t *dest, int line_size, DCTELEM *block); -extern void ff_bfin_add_pixels_clamped (DCTELEM *block, uint8_t *dest, int line_size) attribute_l1_text; -extern void ff_bfin_put_pixels_clamped (DCTELEM *block, uint8_t *dest, int line_size) attribute_l1_text; -extern void ff_bfin_diff_pixels (DCTELEM *block, uint8_t *s1, uint8_t *s2, int stride) attribute_l1_text; -extern void ff_bfin_get_pixels (DCTELEM *restrict block, const uint8_t *pixels, int line_size) attribute_l1_text; -extern int ff_bfin_pix_norm1 (uint8_t * pix, int line_size) attribute_l1_text; -extern int ff_bfin_z_sad8x8 (uint8_t *blk1, uint8_t *blk2, int dsz, int line_size, int h) attribute_l1_text; -extern int ff_bfin_z_sad16x16 (uint8_t *blk1, uint8_t *blk2, int dsz, int line_size, int h) attribute_l1_text; - -extern void ff_bfin_z_put_pixels16_xy2 (uint8_t *block, const uint8_t *s0, int dest_size, int line_size, int h) attribute_l1_text; -extern void ff_bfin_z_put_pixels8_xy2 (uint8_t *block, const uint8_t *s0, int dest_size, int line_size, int h) attribute_l1_text; -extern void ff_bfin_put_pixels16_xy2_nornd (uint8_t *block, const uint8_t *s0, int line_size, int h) attribute_l1_text; -extern void ff_bfin_put_pixels8_xy2_nornd (uint8_t *block, const uint8_t *s0, int line_size, int h) attribute_l1_text; - - -extern int ff_bfin_pix_sum (uint8_t *p, int stride) attribute_l1_text; - -extern void ff_bfin_put_pixels8uc (uint8_t *block, const uint8_t *s0, const uint8_t *s1, int dest_size, int line_size, int h) attribute_l1_text; -extern void ff_bfin_put_pixels16uc (uint8_t *block, const uint8_t *s0, const uint8_t *s1, int dest_size, int line_size, int h) attribute_l1_text; -extern void ff_bfin_put_pixels8uc_nornd (uint8_t *block, const uint8_t *s0, const uint8_t *s1, int line_size, int h) attribute_l1_text; -extern void ff_bfin_put_pixels16uc_nornd (uint8_t *block, const uint8_t *s0, const uint8_t *s1, int line_size, int h) attribute_l1_text; - -extern int ff_bfin_sse4 (void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) attribute_l1_text; -extern int ff_bfin_sse8 (void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) attribute_l1_text; -extern int ff_bfin_sse16 (void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) attribute_l1_text; +void ff_bfin_idct (DCTELEM *block) attribute_l1_text; +void ff_bfin_fdct (DCTELEM *block) attribute_l1_text; +void ff_bfin_vp3_idct (DCTELEM *block); +void ff_bfin_vp3_idct_put (uint8_t *dest, int line_size, DCTELEM *block); +void ff_bfin_vp3_idct_add (uint8_t *dest, int line_size, DCTELEM *block); +void ff_bfin_add_pixels_clamped (DCTELEM *block, uint8_t *dest, int line_size) attribute_l1_text; +void ff_bfin_put_pixels_clamped (DCTELEM *block, uint8_t *dest, int line_size) attribute_l1_text; +void ff_bfin_diff_pixels (DCTELEM *block, uint8_t *s1, uint8_t *s2, int stride) attribute_l1_text; +void ff_bfin_get_pixels (DCTELEM *restrict block, const uint8_t *pixels, int line_size) attribute_l1_text; +int ff_bfin_pix_norm1 (uint8_t * pix, int line_size) attribute_l1_text; +int ff_bfin_z_sad8x8 (uint8_t *blk1, uint8_t *blk2, int dsz, int line_size, int h) attribute_l1_text; +int ff_bfin_z_sad16x16 (uint8_t *blk1, uint8_t *blk2, int dsz, int line_size, int h) attribute_l1_text; + +void ff_bfin_z_put_pixels16_xy2 (uint8_t *block, const uint8_t *s0, int dest_size, int line_size, int h) attribute_l1_text; +void ff_bfin_z_put_pixels8_xy2 (uint8_t *block, const uint8_t *s0, int dest_size, int line_size, int h) attribute_l1_text; +void ff_bfin_put_pixels16_xy2_nornd (uint8_t *block, const uint8_t *s0, int line_size, int h) attribute_l1_text; +void ff_bfin_put_pixels8_xy2_nornd (uint8_t *block, const uint8_t *s0, int line_size, int h) attribute_l1_text; + + +int ff_bfin_pix_sum (uint8_t *p, int stride) attribute_l1_text; + +void ff_bfin_put_pixels8uc (uint8_t *block, const uint8_t *s0, const uint8_t *s1, int dest_size, int line_size, int h) attribute_l1_text; +void ff_bfin_put_pixels16uc (uint8_t *block, const uint8_t *s0, const uint8_t *s1, int dest_size, int line_size, int h) attribute_l1_text; +void ff_bfin_put_pixels8uc_nornd (uint8_t *block, const uint8_t *s0, const uint8_t *s1, int line_size, int h) attribute_l1_text; +void ff_bfin_put_pixels16uc_nornd (uint8_t *block, const uint8_t *s0, const uint8_t *s1, int line_size, int h) attribute_l1_text; + +int ff_bfin_sse4 (void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) attribute_l1_text; +int ff_bfin_sse8 (void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) attribute_l1_text; +int ff_bfin_sse16 (void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) attribute_l1_text; static void bfin_idct_add (uint8_t *dest, int line_size, DCTELEM *block) diff --git a/libavcodec/bfin/mpegvideo_bfin.c b/libavcodec/bfin/mpegvideo_bfin.c index 05743e7f50..d1c33a10ac 100644 --- a/libavcodec/bfin/mpegvideo_bfin.c +++ b/libavcodec/bfin/mpegvideo_bfin.c @@ -26,7 +26,7 @@ #include "dsputil_bfin.h" -extern void ff_bfin_fdct (DCTELEM *block) attribute_l1_text; +void ff_bfin_fdct (DCTELEM *block) attribute_l1_text; static int dct_quantize_bfin (MpegEncContext *s, diff --git a/libavcodec/bfin/vp3_bfin.c b/libavcodec/bfin/vp3_bfin.c index 62990f65b1..1906453523 100644 --- a/libavcodec/bfin/vp3_bfin.c +++ b/libavcodec/bfin/vp3_bfin.c @@ -22,10 +22,10 @@ #include "libavcodec/dsputil.h" #include "dsputil_bfin.h" -extern void ff_bfin_vp3_idct (DCTELEM *block) attribute_l1_text; -extern void ff_bfin_idct (DCTELEM *block) attribute_l1_text; -extern void ff_bfin_add_pixels_clamped (DCTELEM *block, uint8_t *dest, int line_size) attribute_l1_text; -extern void ff_bfin_put_pixels_clamped (DCTELEM *block, uint8_t *dest, int line_size) attribute_l1_text; +void ff_bfin_vp3_idct (DCTELEM *block) attribute_l1_text; +void ff_bfin_idct (DCTELEM *block) attribute_l1_text; +void ff_bfin_add_pixels_clamped (DCTELEM *block, uint8_t *dest, int line_size) attribute_l1_text; +void ff_bfin_put_pixels_clamped (DCTELEM *block, uint8_t *dest, int line_size) attribute_l1_text; /* Intra iDCT offset 128 */ void ff_bfin_vp3_idct_put (uint8_t *dest, int line_size, DCTELEM *block) diff --git a/libavcodec/celp_math.h b/libavcodec/celp_math.h index ce0726fba1..96f4158a4e 100644 --- a/libavcodec/celp_math.h +++ b/libavcodec/celp_math.h @@ -91,6 +91,6 @@ static inline int bidir_sal(int value, int offset) * * @return dot product = sum of elementwise products */ -extern float ff_dot_productf(const float* a, const float* b, int length); +float ff_dot_productf(const float* a, const float* b, int length); #endif /* AVCODEC_CELP_MATH_H */ diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c index e00569c50c..bc7b34ba6a 100644 --- a/libavcodec/dct-test.c +++ b/libavcodec/dct-test.c @@ -46,22 +46,22 @@ void *fast_memcpy(void *a, const void *b, size_t c){return memcpy(a,b,c);}; /* reference fdct/idct */ -extern void fdct(DCTELEM *block); -extern void idct(DCTELEM *block); -extern void init_fdct(); +void fdct(DCTELEM *block); +void idct(DCTELEM *block); +void init_fdct(); -extern void ff_mmx_idct(DCTELEM *data); -extern void ff_mmxext_idct(DCTELEM *data); +void ff_mmx_idct(DCTELEM *data); +void ff_mmxext_idct(DCTELEM *data); -extern void odivx_idct_c (short *block); +void odivx_idct_c(short *block); // BFIN -extern void ff_bfin_idct (DCTELEM *block) ; -extern void ff_bfin_fdct (DCTELEM *block) ; +void ff_bfin_idct(DCTELEM *block); +void ff_bfin_fdct(DCTELEM *block); // ALTIVEC -extern void fdct_altivec (DCTELEM *block); -//extern void idct_altivec (DCTELEM *block);?? no routine +void fdct_altivec(DCTELEM *block); +//void idct_altivec(DCTELEM *block);?? no routine struct algo { diff --git a/libavcodec/i386/dsputil_mmx.c b/libavcodec/i386/dsputil_mmx.c index 161afab16b..28e0e83bbd 100644 --- a/libavcodec/i386/dsputil_mmx.c +++ b/libavcodec/i386/dsputil_mmx.c @@ -2403,14 +2403,14 @@ static void float_to_int16_interleave_3dn2(int16_t *dst, const float **src, long } -extern void ff_snow_horizontal_compose97i_sse2(IDWTELEM *b, int width); -extern void ff_snow_horizontal_compose97i_mmx(IDWTELEM *b, int width); -extern void ff_snow_vertical_compose97i_sse2(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, IDWTELEM *b3, IDWTELEM *b4, IDWTELEM *b5, int width); -extern void ff_snow_vertical_compose97i_mmx(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, IDWTELEM *b3, IDWTELEM *b4, IDWTELEM *b5, int width); -extern void ff_snow_inner_add_yblock_sse2(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); -extern void ff_snow_inner_add_yblock_mmx(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); +void ff_snow_horizontal_compose97i_sse2(IDWTELEM *b, int width); +void ff_snow_horizontal_compose97i_mmx(IDWTELEM *b, int width); +void ff_snow_vertical_compose97i_sse2(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, IDWTELEM *b3, IDWTELEM *b4, IDWTELEM *b5, int width); +void ff_snow_vertical_compose97i_mmx(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, IDWTELEM *b3, IDWTELEM *b4, IDWTELEM *b5, int width); +void ff_snow_inner_add_yblock_sse2(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); +void ff_snow_inner_add_yblock_mmx(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); static void add_int16_sse2(int16_t * v1, int16_t * v2, int order) diff --git a/libavcodec/libxvidff.c b/libavcodec/libxvidff.c index 36f27c7eed..3ab1374f44 100644 --- a/libavcodec/libxvidff.c +++ b/libavcodec/libxvidff.c @@ -38,7 +38,7 @@ #define BUFFER_CAT(x) (&((x)[strlen(x)])) /* For PPC Use */ -extern int has_altivec(void); +int has_altivec(void); /** * Structure for the private Xvid context. diff --git a/libavcodec/mpc.h b/libavcodec/mpc.h index 304013554a..038c34f20a 100644 --- a/libavcodec/mpc.h +++ b/libavcodec/mpc.h @@ -74,7 +74,7 @@ typedef struct { DECLARE_ALIGNED_16(int32_t, sb_samples[MPA_MAX_CHANNELS][36][SBLIMIT]); } MPCContext; -extern void ff_mpc_init(); -extern void ff_mpc_dequantize_and_synth(MPCContext *c, int maxband, void *dst); +void ff_mpc_init(); +void ff_mpc_dequantize_and_synth(MPCContext *c, int maxband, void *dst); #endif /* AVCODEC_MPC_H */ diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 8b6a93ed26..3122bb191c 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -63,10 +63,10 @@ static inline int mpeg2_fast_decode_block_intra(MpegEncContext *s, DCTELEM *bloc static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred); static void exchange_uv(MpegEncContext *s); -extern int XVMC_field_start(MpegEncContext *s, AVCodecContext *avctx); -extern int XVMC_field_end(MpegEncContext *s); -extern void XVMC_pack_pblocks(MpegEncContext *s,int cbp); -extern void XVMC_init_block(MpegEncContext *s);//set s->block +int XVMC_field_start(MpegEncContext *s, AVCodecContext *avctx); +int XVMC_field_end(MpegEncContext *s); +void XVMC_pack_pblocks(MpegEncContext *s,int cbp); +void XVMC_init_block(MpegEncContext *s);//set s->block static const enum PixelFormat pixfmt_xvmc_mpg2_420[] = { PIX_FMT_XVMC_MPEG2_IDCT, diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index ddc4d091aa..9b2f34c13f 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -54,9 +54,9 @@ static void dct_unquantize_h263_intra_c(MpegEncContext *s, static void dct_unquantize_h263_inter_c(MpegEncContext *s, DCTELEM *block, int n, int qscale); -extern int XVMC_field_start(MpegEncContext*s, AVCodecContext *avctx); -extern void XVMC_field_end(MpegEncContext *s); -extern void XVMC_decode_mb(MpegEncContext *s); +int XVMC_field_start(MpegEncContext*s, AVCodecContext *avctx); +void XVMC_field_end(MpegEncContext *s); +void XVMC_decode_mb(MpegEncContext *s); /* enable all paranoid tests for rounding, overflows, etc... */ diff --git a/libavcodec/png.h b/libavcodec/png.h index 0fde3f41d6..17b1466fa8 100644 --- a/libavcodec/png.h +++ b/libavcodec/png.h @@ -64,14 +64,13 @@ extern const uint8_t ff_png_pass_xshift[NB_PASSES]; /* Mask to determine which pixels are valid in a pass */ extern const uint8_t ff_png_pass_mask[NB_PASSES]; -extern void *ff_png_zalloc(void *opaque, unsigned int items, - unsigned int size); +void *ff_png_zalloc(void *opaque, unsigned int items, unsigned int size); -extern void ff_png_zfree(void *opaque, void *ptr); +void ff_png_zfree(void *opaque, void *ptr); -extern int ff_png_get_nb_channels(int color_type); +int ff_png_get_nb_channels(int color_type); /* compute the row size of an interleaved pass */ -extern int ff_png_pass_row_size(int pass, int bits_per_pixel, int width); +int ff_png_pass_row_size(int pass, int bits_per_pixel, int width); #endif /* AVCODEC_PNG_H */ diff --git a/libavcodec/ppc/dsputil_altivec.h b/libavcodec/ppc/dsputil_altivec.h index 63f817a215..03ff0b9fc8 100644 --- a/libavcodec/ppc/dsputil_altivec.h +++ b/libavcodec/ppc/dsputil_altivec.h @@ -25,7 +25,7 @@ #include <stdint.h> -extern int has_altivec(void); +int has_altivec(void); void put_pixels16_altivec(uint8_t *block, const uint8_t *pixels, int line_size, int h); diff --git a/libavcodec/ppc/dsputil_ppc.c b/libavcodec/ppc/dsputil_ppc.c index 443e1db3c0..124453ef9b 100644 --- a/libavcodec/ppc/dsputil_ppc.c +++ b/libavcodec/ppc/dsputil_ppc.c @@ -27,11 +27,11 @@ #ifdef HAVE_ALTIVEC #include "dsputil_altivec.h" -extern void fdct_altivec(int16_t *block); -extern void gmc1_altivec(uint8_t *dst, uint8_t *src, int stride, int h, - int x16, int y16, int rounder); -extern void idct_put_altivec(uint8_t *dest, int line_size, int16_t *block); -extern void idct_add_altivec(uint8_t *dest, int line_size, int16_t *block); +void fdct_altivec(int16_t *block); +void gmc1_altivec(uint8_t *dst, uint8_t *src, int stride, int h, + int x16, int y16, int rounder); +void idct_put_altivec(uint8_t *dest, int line_size, int16_t *block); +void idct_add_altivec(uint8_t *dest, int line_size, int16_t *block); void dsputil_h264_init_ppc(DSPContext* c, AVCodecContext *avctx); diff --git a/libavcodec/ppc/mpegvideo_altivec.c b/libavcodec/ppc/mpegvideo_altivec.c index ba1719f45e..28ada7a316 100644 --- a/libavcodec/ppc/mpegvideo_altivec.c +++ b/libavcodec/ppc/mpegvideo_altivec.c @@ -585,8 +585,8 @@ POWERPC_PERF_STOP_COUNT(altivec_dct_unquantize_h263_num, nCoeffs == 63); } -extern void idct_put_altivec(uint8_t *dest, int line_size, int16_t *block); -extern void idct_add_altivec(uint8_t *dest, int line_size, int16_t *block); +void idct_put_altivec(uint8_t *dest, int line_size, int16_t *block); +void idct_add_altivec(uint8_t *dest, int line_size, int16_t *block); void MPV_common_init_altivec(MpegEncContext *s) { diff --git a/libavcodec/sh4/dsputil_sh4.c b/libavcodec/sh4/dsputil_sh4.c index c8d0eae931..2c86a7aa48 100644 --- a/libavcodec/sh4/dsputil_sh4.c +++ b/libavcodec/sh4/dsputil_sh4.c @@ -51,7 +51,7 @@ static void clear_blocks_sh4(DCTELEM *blocks) memzero_align8(blocks,sizeof(DCTELEM)*6*64); } -extern void idct_sh4(DCTELEM *block); +void idct_sh4(DCTELEM *block); static void idct_put(uint8_t *dest, int line_size, DCTELEM *block) { int i; @@ -89,7 +89,7 @@ static void idct_add(uint8_t *dest, int line_size, DCTELEM *block) } } -extern void dsputil_init_align(DSPContext* c, AVCodecContext *avctx); +void dsputil_init_align(DSPContext* c, AVCodecContext *avctx); void dsputil_init_sh4(DSPContext* c, AVCodecContext *avctx) { diff --git a/libavcodec/snow.h b/libavcodec/snow.h index 67dbbd80c0..b208e5fe6a 100644 --- a/libavcodec/snow.h +++ b/libavcodec/snow.h @@ -121,9 +121,9 @@ struct slice_buffer_s { #define W_DS 9 #endif -extern void ff_snow_vertical_compose97i(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, IDWTELEM *b3, IDWTELEM *b4, IDWTELEM *b5, int width); -extern void ff_snow_horizontal_compose97i(IDWTELEM *b, int width); -extern 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); +void ff_snow_vertical_compose97i(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, IDWTELEM *b3, IDWTELEM *b4, IDWTELEM *b5, int width); +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 int w53_32_c(void *v, uint8_t * pix1, uint8_t * pix2, int line_size, int h); diff --git a/libavcodec/sparc/dsputil_vis.c b/libavcodec/sparc/dsputil_vis.c index a01eea31bb..0779395986 100644 --- a/libavcodec/sparc/dsputil_vis.c +++ b/libavcodec/sparc/dsputil_vis.c @@ -31,9 +31,9 @@ #include "vis.h" -extern void ff_simple_idct_put_vis(uint8_t *dest, int line_size, DCTELEM *data); -extern void ff_simple_idct_add_vis(uint8_t *dest, int line_size, DCTELEM *data); -extern void ff_simple_idct_vis(DCTELEM *data); +void ff_simple_idct_put_vis(uint8_t *dest, int line_size, DCTELEM *data); +void ff_simple_idct_add_vis(uint8_t *dest, int line_size, DCTELEM *data); +void ff_simple_idct_vis(DCTELEM *data); /* The trick used in some of this file is the formula from the MMX * motion comp code, which is: |