diff options
author | Martin Storsjö <martin@martin.st> | 2012-02-15 12:43:58 +0200 |
---|---|---|
committer | Martin Storsjö <martin@martin.st> | 2012-02-15 22:06:58 +0200 |
commit | 35e02a3d0e49522d2810df76dab8cdac76ef804f (patch) | |
tree | 9b57b7343008580486758621e2b47ba3f8aea8ba /libavcodec/snowdec.c | |
parent | d6c8dcb8ac0b844f24a07168022dead5e5ff9b91 (diff) | |
download | ffmpeg-35e02a3d0e49522d2810df76dab8cdac76ef804f.tar.gz |
snow: Add ff_ prefix to nonstatic symbols
This allows getting rid of a hack for conflicting symbol/define
names.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec/snowdec.c')
-rw-r--r-- | libavcodec/snowdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/snowdec.c b/libavcodec/snowdec.c index 2b6f6e11c7..1dccc638d8 100644 --- a/libavcodec/snowdec.c +++ b/libavcodec/snowdec.c @@ -42,7 +42,7 @@ static av_always_inline void predict_slice_buffered(SnowContext *s, slice_buffer int x, y, mb_x; int block_size = MB_SIZE >> s->block_max_depth; int block_w = plane_index ? block_size/2 : block_size; - const uint8_t *obmc = plane_index ? obmc_tab[s->block_max_depth+1] : obmc_tab[s->block_max_depth]; + const uint8_t *obmc = plane_index ? ff_obmc_tab[s->block_max_depth+1] : ff_obmc_tab[s->block_max_depth]; int obmc_stride= plane_index ? block_size : 2*block_size; int ref_stride= s->current_picture.linesize[plane_index]; uint8_t *dst8= s->current_picture.data[plane_index]; @@ -95,7 +95,7 @@ static inline void decode_subband_slice_buffered(SnowContext *s, SubBand *b, sli const int w= b->width; int y; const int qlog= av_clip(s->qlog + b->qlog, 0, QROOT*16); - int qmul= qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT); + int qmul= ff_qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT); int qadd= (s->qbias*qmul)>>QBIAS_SHIFT; int new_index = 0; @@ -184,7 +184,7 @@ static void decode_q_branch(SnowContext *s, int level, int x, int y){ static void dequantize_slice_buffered(SnowContext *s, slice_buffer * sb, SubBand *b, IDWTELEM *src, int stride, int start_y, int end_y){ const int w= b->width; const int qlog= av_clip(s->qlog + b->qlog, 0, QROOT*16); - const int qmul= qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT); + const int qmul= ff_qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT); const int qadd= (s->qbias*qmul)>>QBIAS_SHIFT; int x,y; |