diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2012-06-14 11:47:55 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2012-06-17 23:20:10 +0100 |
| commit | d9669eab0b8709f66d0872671511cb9487ea2651 (patch) | |
| tree | e5bfe25fa298d33761ef5e4ee6a01f9198bcaed6 /libavcodec/dwt.h | |
| parent | 8e50c57dcb481479f2fd46f9bdb6a9776b0d9fa6 (diff) | |
| download | ffmpeg-d9669eab0b8709f66d0872671511cb9487ea2651.tar.gz | |
dwt: remove variable-length arrays
Signed-off-by: Mans Rullgard <mans@mansr.com>
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 9229928f33..771a9bf53e 100644 --- a/libavcodec/dwt.h +++ b/libavcodec/dwt.h @@ -50,7 +50,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, @@ -148,7 +148,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, @@ -157,18 +157,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); |