---
libavcodec/aacps.c | 2 +-
libavcodec/bmpenc.c | 2 +-
libavcodec/rawdec.c | 2 +-
libavcodec/tiertexseqv.c | 2 +-
libavcodec/utils.c | 2 +-
libavcodec/xsubdec.c | 2 +-
libavcodec/xsubenc.c | 2 +-
libavformat/matroskadec.c | 4 ++--
libavformat/rtsp.c | 2 +-
libavutil/common.h | 6 +++---
libavutil/imgutils.c | 4 ++--
libavutil/imgutils.h | 2 +-
libavutil/mathematics.c | 2 +-
13 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/libavcodec/aacps.c b/libavcodec/aacps.c
index fa7e9ac..42ee532 100644
--- a/libavcodec/aacps.c
+++ b/libavcodec/aacps.c
@@ -193,7 +193,7 @@ int ff_ps_read_data(AVCodecContext *avctx, GetBitContext
*gb_host, PSContext *ps
ps->border_position[e] = get_bits(gb, 5);
} else
for (e = 1; e <= ps->num_env; e++)
- ps->border_position[e] = (e * numQMFSlots >>
ff_log2_tab[ps->num_env]) - 1;
+ ps->border_position[e] = (e * numQMFSlots >>
avpriv_log2_tab[ps->num_env]) - 1;
if (ps->enable_iid) {
for (e = 0; e < ps->num_env; e++) {
diff --git a/libavcodec/bmpenc.c b/libavcodec/bmpenc.c
index 37cf6e1..791d846 100644
--- a/libavcodec/bmpenc.c
+++ b/libavcodec/bmpenc.c
@@ -93,7 +93,7 @@ static int bmp_encode_frame(AVCodecContext *avctx, AVPacket
*pkt,
case PIX_FMT_RGB4_BYTE:
case PIX_FMT_BGR4_BYTE:
case PIX_FMT_GRAY8:
- ff_set_systematic_pal2((uint32_t*)p->data[1], avctx->pix_fmt);
+ avpriv_set_systematic_pal2((uint32_t*)p->data[1], avctx->pix_fmt);
case PIX_FMT_PAL8:
pal = (uint32_t *)p->data[1];
break;
diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c
index ee316ea..9ff040d 100644
--- a/libavcodec/rawdec.c
+++ b/libavcodec/rawdec.c
@@ -86,7 +86,7 @@ static av_cold int raw_init_decoder(AVCodecContext *avctx)
else if (avctx->pix_fmt == PIX_FMT_NONE && avctx->bits_per_coded_sample)
avctx->pix_fmt = find_pix_fmt(pix_fmt_bps_avi,
avctx->bits_per_coded_sample);
- ff_set_systematic_pal2(context->palette, avctx->pix_fmt);
+ avpriv_set_systematic_pal2(context->palette, avctx->pix_fmt);
context->length = avpicture_get_size(avctx->pix_fmt, avctx->width,
avctx->height);
if((avctx->bits_per_coded_sample == 4 || avctx->bits_per_coded_sample ==
2) &&
avctx->pix_fmt==PIX_FMT_PAL8 &&
diff --git a/libavcodec/tiertexseqv.c b/libavcodec/tiertexseqv.c
index c488b8b..542cc5f 100644
--- a/libavcodec/tiertexseqv.c
+++ b/libavcodec/tiertexseqv.c
@@ -107,7 +107,7 @@ static const unsigned char *seq_decode_op1(SeqVideoContext
*seq,
} else {
if (len <= 0)
return NULL;
- bits = ff_log2_tab[len - 1] + 1;
+ bits = avpriv_log2_tab[len - 1] + 1;
if (src_end - src < len + 8 * bits)
return NULL;
color_table = src;
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index a72c434..c262dc7 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -478,7 +478,7 @@ static int video_get_buffer(AVCodecContext *s, AVFrame *pic)
buf->linesize[i] = 0;
}
if (size[1] && !size[2])
- ff_set_systematic_pal2((uint32_t *)buf->data[1], s->pix_fmt);
+ avpriv_set_systematic_pal2((uint32_t *)buf->data[1], s->pix_fmt);
buf->width = s->width;
buf->height = s->height;
buf->pix_fmt = s->pix_fmt;
diff --git a/libavcodec/xsubdec.c b/libavcodec/xsubdec.c
index 6a1acc7..0d6b443 100644
--- a/libavcodec/xsubdec.c
+++ b/libavcodec/xsubdec.c
@@ -118,7 +118,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
int *data_size,
// interlaced: do odd lines
if (y == (h + 1) / 2) bitmap = sub->rects[0]->pict.data[0] + w;
for (x = 0; x < w; ) {
- int log2 = ff_log2_tab[show_bits(&gb, 8)];
+ int log2 = avpriv_log2_tab[show_bits(&gb, 8)];
int run = get_bits(&gb, 14 - 4 * (log2 >> 1));
int color = get_bits(&gb, 2);
run = FFMIN(run, w - x);
diff --git a/libavcodec/xsubenc.c b/libavcodec/xsubenc.c
index 816e651..85918f4 100644
--- a/libavcodec/xsubenc.c
+++ b/libavcodec/xsubenc.c
@@ -42,7 +42,7 @@
static void put_xsub_rle(PutBitContext *pb, int len, int color)
{
if (len <= 255)
- put_bits(pb, 2 + ((ff_log2_tab[len] >> 1) << 2), len);
+ put_bits(pb, 2 + ((avpriv_log2_tab[len] >> 1) << 2), len);
else
put_bits(pb, 14, 0);
put_bits(pb, 2, color);
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 094b055..20f685d 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -604,7 +604,7 @@ static int ebml_read_num(MatroskaDemuxContext *matroska,
AVIOContext *pb,
}
/* get the length of the EBML number */
- read = 8 - ff_log2_tab[total];
+ read = 8 - avpriv_log2_tab[total];
if (read > max_size) {
int64_t pos = avio_tell(pb) - 1;
av_log(matroska->ctx, AV_LOG_ERROR,
@@ -614,7 +614,7 @@ static int ebml_read_num(MatroskaDemuxContext *matroska,
AVIOContext *pb,
}
/* read out length */
- total ^= 1 << ff_log2_tab[total];
+ total ^= 1 << avpriv_log2_tab[total];
while (n++ < read)
total = (total << 8) | avio_r8(pb);
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index df27218..aeb13da 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -1649,7 +1649,7 @@ redirect:
goto fail;
do {
- int lower_transport = ff_log2_tab[lower_transport_mask &
+ int lower_transport = avpriv_log2_tab[lower_transport_mask &
~(lower_transport_mask - 1)];
err = ff_rtsp_make_setup_request(s, host, port, lower_transport,
diff --git a/libavutil/common.h b/libavutil/common.h
index 433e8e4..54a712f 100644
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -60,7 +60,7 @@
#define FFALIGN(x, a) (((x)+(a)-1)&~((a)-1))
/* misc math functions */
-extern const uint8_t ff_log2_tab[256];
+extern const uint8_t avpriv_log2_tab[256];
extern const uint8_t av_reverse[256];
@@ -75,7 +75,7 @@ static av_always_inline av_const int av_log2_c(unsigned int v)
v >>= 8;
n += 8;
}
- n += ff_log2_tab[v];
+ n += avpriv_log2_tab[v];
return n;
}
@@ -87,7 +87,7 @@ static av_always_inline av_const int av_log2_16bit_c(unsigned
int v)
v >>= 8;
n += 8;
}
- n += ff_log2_tab[v];
+ n += avpriv_log2_tab[v];
return n;
}
diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c
index 4e394b6..e60963c 100644
--- a/libavutil/imgutils.c
+++ b/libavutil/imgutils.c
@@ -133,7 +133,7 @@ int av_image_fill_pointers(uint8_t *data[4], enum
PixelFormat pix_fmt, int heigh
return total_size;
}
-int ff_set_systematic_pal2(uint32_t pal[256], enum PixelFormat pix_fmt)
+int avpriv_set_systematic_pal2(uint32_t pal[256], enum PixelFormat pix_fmt)
{
int i;
@@ -198,7 +198,7 @@ int av_image_alloc(uint8_t *pointers[4], int linesizes[4],
}
if (av_pix_fmt_descriptors[pix_fmt].flags & PIX_FMT_PAL ||
av_pix_fmt_descriptors[pix_fmt].flags & PIX_FMT_PSEUDOPAL)
- ff_set_systematic_pal2((uint32_t*)pointers[1], pix_fmt);
+ avpriv_set_systematic_pal2((uint32_t*)pointers[1], pix_fmt);
return ret;
}
diff --git a/libavutil/imgutils.h b/libavutil/imgutils.h
index 3815a49..7e77de0 100644
--- a/libavutil/imgutils.h
+++ b/libavutil/imgutils.h
@@ -128,7 +128,7 @@ void av_image_copy(uint8_t *dst_data[4], int
dst_linesizes[4],
*/
int av_image_check_size(unsigned int w, unsigned int h, int log_offset, void
*log_ctx);
-int ff_set_systematic_pal2(uint32_t pal[256], enum PixelFormat pix_fmt);
+int avpriv_set_systematic_pal2(uint32_t pal[256], enum PixelFormat pix_fmt);
/**
* @}
diff --git a/libavutil/mathematics.c b/libavutil/mathematics.c
index ce89195..af3ef93 100644
--- a/libavutil/mathematics.c
+++ b/libavutil/mathematics.c
@@ -28,7 +28,7 @@
#include <limits.h>
#include "mathematics.h"
-const uint8_t ff_log2_tab[256]={
+const uint8_t avpriv_log2_tab[256] = {
0,0,1,1,2,2,2,2,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
--
1.7.1
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
