diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-02 21:00:15 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-02 21:01:10 +0200 |
commit | 50b0edea9f48c831909313c15b0677957789ff53 (patch) | |
tree | 9c1dbf2e74e027022cefbba74543b747d8884485 /libavcodec/dsputil.h | |
parent | 083e65cfd22e44719eedfad4c2d3ed290688661d (diff) | |
parent | 15616eb04206b64bcf08ad351f4c754e69e00666 (diff) | |
download | ffmpeg-50b0edea9f48c831909313c15b0677957789ff53.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
intrax8: move functions from dsputil to own context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.h')
-rw-r--r-- | libavcodec/dsputil.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index f9f6c89a5e..1d4650eab2 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -382,9 +382,6 @@ typedef struct DSPContext { void (*h261_loop_filter)(uint8_t *src, int stride); - void (*x8_v_loop_filter)(uint8_t *src, int stride, int qscale); - void (*x8_h_loop_filter)(uint8_t *src, int stride, int qscale); - /* assume len is a multiple of 4, and arrays are 16-byte aligned */ void (*vorbis_inverse_coupling)(float *mag, float *ang, int blocksize); void (*ac3_downmix)(float (*samples)[256], float (*matrix)[2], int out_ch, int in_ch, int len); @@ -499,11 +496,6 @@ typedef struct DSPContext { unsigned int filter_shift, int32_t mask, int blocksize, int32_t *sample_buffer); - /* intrax8 functions */ - void (*x8_spatial_compensation[12])(uint8_t *src , uint8_t *dst, int linesize); - void (*x8_setup_spatial_compensation)(uint8_t *src, uint8_t *dst, int linesize, - int * range, int * sum, int edges); - /** * Calculate scalar product of two vectors. * @param len length of vectors, should be multiple of 16 @@ -632,7 +624,6 @@ void ff_dsputil_init_sh4(DSPContext* c, AVCodecContext *avctx); void ff_dsputil_init_vis(DSPContext* c, AVCodecContext *avctx); void ff_dsputil_init_dwt(DSPContext *c); -void ff_intrax8dsp_init(DSPContext* c, AVCodecContext *avctx); void ff_mlp_init(DSPContext* c, AVCodecContext *avctx); void ff_mlp_init_x86(DSPContext* c, AVCodecContext *avctx); |