diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-18 20:05:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-18 20:07:00 +0200 |
| commit | 82edf6727f0663601351081ca1e4fb20d1752972 (patch) | |
| tree | 12479c3ec8cedfa0ec4dda38a72023224f2b5b73 /libavcodec/dwt.h | |
| parent | f87dacb27de93f995cb18f9dcc73581ef8fc157b (diff) | |
| parent | f61ce90caa909d131ea6ec205823568a38115529 (diff) | |
| download | ffmpeg-82edf6727f0663601351081ca1e4fb20d1752972.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavr: add x86-optimized functions for mixing 1-to-2 s16p with flt coeffs
lavr: add x86-optimized functions for mixing 1-to-2 fltp with flt coeffs
Add Dolby/DPLII downmix support to libavresample
vorbisdec: replace div/mod in loop with a counter
fate: vorbis: add 5.1 surround test
rtpenc: Allow requesting H264 RTP packetization mode 0
configure: Sort the library listings in the help text alphabetically
dwt: remove variable-length arrays
RTMPT protocol support
http: Properly handle chunked transfer-encoding for replies to post data
http: Fail reading if the connection has gone away
amr: Mark an array const
amr: More space cleanup
rtpenc: Fix memory leaks in the muxer open function
Conflicts:
Changelog
configure
doc/APIchanges
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dwt.h')
| -rw-r--r-- | libavcodec/dwt.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/dwt.h b/libavcodec/dwt.h index aa7d98dc28..53e1aaab06 100644 --- a/libavcodec/dwt.h +++ b/libavcodec/dwt.h @@ -79,7 +79,7 @@ typedef struct DWTContext { void (*vertical_compose97i)(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, IDWTELEM *b3, IDWTELEM *b4, IDWTELEM *b5, int width); - void (*horizontal_compose97i)(IDWTELEM *b, int width); + void (*horizontal_compose97i)(IDWTELEM *b, IDWTELEM *temp, int width); void (*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, @@ -239,7 +239,7 @@ IDWTELEM *ff_slice_buffer_load_line(slice_buffer *buf, int line); 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_horizontal_compose97i(IDWTELEM *b, IDWTELEM *temp, 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, @@ -248,18 +248,18 @@ void ff_snow_inner_add_yblock(const uint8_t *obmc, const int obmc_stride, int ff_w53_32_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h); int ff_w97_32_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h); -void ff_spatial_dwt(int *buffer, int width, int height, int stride, int type, - int decomposition_count); +void ff_spatial_dwt(int *buffer, int *temp, int width, int height, int stride, + int type, int decomposition_count); void ff_spatial_idwt_buffered_init(DWTCompose *cs, slice_buffer *sb, int width, int height, int stride_line, int type, int decomposition_count); void ff_spatial_idwt_buffered_slice(DWTContext *dsp, DWTCompose *cs, - slice_buffer *slice_buf, int width, - int height, int stride_line, int type, - int decomposition_count, int y); -void ff_spatial_idwt(IDWTELEM *buffer, int width, int height, int stride, - int type, int decomposition_count); + slice_buffer *slice_buf, IDWTELEM *temp, + int width, int height, int stride_line, + int type, int decomposition_count, int y); +void ff_spatial_idwt(IDWTELEM *buffer, IDWTELEM *temp, int width, int height, + int stride, int type, int decomposition_count); void ff_dwt_init(DWTContext *c); void ff_dwt_init_x86(DWTContext *c); |