Mercurial > libavcodec.hg
diff dwt.h @ 11486:1bf7af4db35a libavcodec
Add ff_ prefix to dwt functions
author | mru |
---|---|
date | Sun, 14 Mar 2010 17:50:16 +0000 |
parents | 0f0cd6b5791f |
children |
line wrap: on
line diff
--- a/dwt.h Sun Mar 14 17:50:12 2010 +0000 +++ b/dwt.h Sun Mar 14 17:50:16 2010 +0000 @@ -126,21 +126,21 @@ #define W_DS 9 #endif -#define slice_buffer_get_line(slice_buf, line_num) ((slice_buf)->line[line_num] ? (slice_buf)->line[line_num] : slice_buffer_load_line((slice_buf), (line_num))) -//#define slice_buffer_get_line(slice_buf, line_num) (slice_buffer_load_line((slice_buf), (line_num))) +#define slice_buffer_get_line(slice_buf, line_num) ((slice_buf)->line[line_num] ? (slice_buf)->line[line_num] : ff_slice_buffer_load_line((slice_buf), (line_num))) +//#define slice_buffer_get_line(slice_buf, line_num) (ff_slice_buffer_load_line((slice_buf), (line_num))) -void slice_buffer_init(slice_buffer * buf, int line_count, int max_allocated_lines, int line_width, IDWTELEM * base_buffer); -void slice_buffer_release(slice_buffer * buf, int line); -void slice_buffer_flush(slice_buffer * buf); -void slice_buffer_destroy(slice_buffer * buf); -IDWTELEM * slice_buffer_load_line(slice_buffer * buf, int line); +void ff_slice_buffer_init(slice_buffer * buf, int line_count, int max_allocated_lines, int line_width, IDWTELEM * base_buffer); +void ff_slice_buffer_release(slice_buffer * buf, int line); +void ff_slice_buffer_flush(slice_buffer * buf); +void ff_slice_buffer_destroy(slice_buffer * buf); +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_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); -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); +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);