summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-05-28 21:48:49 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-05-28 21:48:49 +0200
commit75647622b530e8ec98ce364c9d6c38ca1b292e6d (patch)
tree4dee7cfdf6f30f1239b577985bc22a7ca80c7e2a
parent68cce0101df074c41d2f4cfc8a9a36a000a8393e (diff)
parent6f57375d707de40dcec28d3cef886c364e032c21 (diff)
Merge commit '6f57375d707de40dcec28d3cef886c364e032c21'
* commit '6f57375d707de40dcec28d3cef886c364e032c21': rl: Rename ff_*_rl() to ff_rl_*() Conflicts: libavcodec/mpeg4videodec.c libavcodec/rl.c libavcodec/rl.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/h261.c2
-rw-r--r--libavcodec/ituh263dec.c4
-rw-r--r--libavcodec/ituh263enc.c4
-rw-r--r--libavcodec/mpeg12.c4
-rw-r--r--libavcodec/mpeg12enc.c4
-rw-r--r--libavcodec/mpeg4videodec.c6
-rw-r--r--libavcodec/mpeg4videoenc.c2
-rw-r--r--libavcodec/msmpeg4dec.c2
-rw-r--r--libavcodec/msmpeg4enc.c2
-rw-r--r--libavcodec/rl.c4
-rw-r--r--libavcodec/rl.h6
11 files changed, 20 insertions, 20 deletions
diff --git a/libavcodec/h261.c b/libavcodec/h261.c
index 9836905d93..f33d1a12f9 100644
--- a/libavcodec/h261.c
+++ b/libavcodec/h261.c
@@ -87,6 +87,6 @@ av_cold void ff_h261_common_init(void)
if (done)
return;
- ff_init_rl(&ff_h261_rl_tcoeff, ff_h261_rl_table_store);
+ ff_rl_init(&ff_h261_rl_tcoeff, ff_h261_rl_table_store);
done = 1;
}
diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c
index c41e600809..8c612c4c68 100644
--- a/libavcodec/ituh263dec.c
+++ b/libavcodec/ituh263dec.c
@@ -118,8 +118,8 @@ av_cold void ff_h263_decode_init_vlc(void)
INIT_VLC_STATIC(&mv_vlc, MV_VLC_BITS, 33,
&ff_mvtab[0][1], 2, 1,
&ff_mvtab[0][0], 2, 1, 538);
- ff_init_rl(&ff_h263_rl_inter, ff_h263_static_rl_table_store[0]);
- ff_init_rl(&ff_rl_intra_aic, ff_h263_static_rl_table_store[1]);
+ ff_rl_init(&ff_h263_rl_inter, ff_h263_static_rl_table_store[0]);
+ ff_rl_init(&ff_rl_intra_aic, ff_h263_static_rl_table_store[1]);
INIT_VLC_RL(ff_h263_rl_inter, 554);
INIT_VLC_RL(ff_rl_intra_aic, 554);
INIT_VLC_STATIC(&h263_mbtype_b_vlc, H263_MBTYPE_B_VLC_BITS, 15,
diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c
index 15b2ef183d..8d5fb91812 100644
--- a/libavcodec/ituh263enc.c
+++ b/libavcodec/ituh263enc.c
@@ -764,8 +764,8 @@ av_cold void ff_h263_encode_init(MpegEncContext *s)
if (!done) {
done = 1;
- ff_init_rl(&ff_h263_rl_inter, ff_h263_static_rl_table_store[0]);
- ff_init_rl(&ff_rl_intra_aic, ff_h263_static_rl_table_store[1]);
+ ff_rl_init(&ff_h263_rl_inter, ff_h263_static_rl_table_store[0]);
+ ff_rl_init(&ff_rl_intra_aic, ff_h263_static_rl_table_store[1]);
init_uni_h263_rl_tab(&ff_rl_intra_aic, NULL, uni_h263_intra_aic_rl_len);
init_uni_h263_rl_tab(&ff_h263_rl_inter , NULL, uni_h263_inter_rl_len);
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index 3128e8d1e3..0fedbbdc48 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -170,8 +170,8 @@ av_cold void ff_mpeg12_init_vlcs(void)
INIT_VLC_STATIC(&ff_mb_btype_vlc, MB_BTYPE_VLC_BITS, 11,
&table_mb_btype[0][1], 2, 1,
&table_mb_btype[0][0], 2, 1, 64);
- ff_init_rl(&ff_rl_mpeg1, ff_mpeg12_static_rl_table_store[0]);
- ff_init_rl(&ff_rl_mpeg2, ff_mpeg12_static_rl_table_store[1]);
+ ff_rl_init(&ff_rl_mpeg1, ff_mpeg12_static_rl_table_store[0]);
+ ff_rl_init(&ff_rl_mpeg2, ff_mpeg12_static_rl_table_store[1]);
INIT_2D_VLC_RL(ff_rl_mpeg1, 680);
INIT_2D_VLC_RL(ff_rl_mpeg2, 674);
diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c
index 25e216703c..d131e48285 100644
--- a/libavcodec/mpeg12enc.c
+++ b/libavcodec/mpeg12enc.c
@@ -1016,8 +1016,8 @@ av_cold void ff_mpeg1_encode_init(MpegEncContext *s)
int i;
done = 1;
- ff_init_rl(&ff_rl_mpeg1, ff_mpeg12_static_rl_table_store[0]);
- ff_init_rl(&ff_rl_mpeg2, ff_mpeg12_static_rl_table_store[1]);
+ ff_rl_init(&ff_rl_mpeg1, ff_mpeg12_static_rl_table_store[0]);
+ ff_rl_init(&ff_rl_mpeg2, ff_mpeg12_static_rl_table_store[1]);
for (i = 0; i < 64; i++) {
mpeg1_max_level[0][i] = ff_rl_mpeg1.max_level[0][i];
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index cbae9a04ff..9ef65ffc84 100644
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -2612,9 +2612,9 @@ av_cold void ff_mpeg4videodec_static_init(void) {
static int done = 0;
if (!done) {
- ff_init_rl(&ff_mpeg4_rl_intra, ff_mpeg4_static_rl_table_store[0]);
- ff_init_rl(&ff_rvlc_rl_inter, ff_mpeg4_static_rl_table_store[1]);
- ff_init_rl(&ff_rvlc_rl_intra, ff_mpeg4_static_rl_table_store[2]);
+ ff_rl_init(&ff_mpeg4_rl_intra, ff_mpeg4_static_rl_table_store[0]);
+ ff_rl_init(&ff_rvlc_rl_inter, ff_mpeg4_static_rl_table_store[1]);
+ ff_rl_init(&ff_rvlc_rl_intra, ff_mpeg4_static_rl_table_store[2]);
INIT_VLC_RL(ff_mpeg4_rl_intra, 554);
INIT_VLC_RL(ff_rvlc_rl_inter, 1072);
INIT_VLC_RL(ff_rvlc_rl_intra, 1072);
diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c
index 4b602f0a79..bca294ebd8 100644
--- a/libavcodec/mpeg4videoenc.c
+++ b/libavcodec/mpeg4videoenc.c
@@ -1308,7 +1308,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
init_uni_dc_tab();
- ff_init_rl(&ff_mpeg4_rl_intra, ff_mpeg4_static_rl_table_store[0]);
+ ff_rl_init(&ff_mpeg4_rl_intra, ff_mpeg4_static_rl_table_store[0]);
init_uni_mpeg4_rl_tab(&ff_mpeg4_rl_intra, uni_mpeg4_intra_rl_bits, uni_mpeg4_intra_rl_len);
init_uni_mpeg4_rl_tab(&ff_h263_rl_inter, uni_mpeg4_inter_rl_bits, uni_mpeg4_inter_rl_len);
diff --git a/libavcodec/msmpeg4dec.c b/libavcodec/msmpeg4dec.c
index c492fdbe48..cd88ec0f6a 100644
--- a/libavcodec/msmpeg4dec.c
+++ b/libavcodec/msmpeg4dec.c
@@ -301,7 +301,7 @@ av_cold int ff_msmpeg4_decode_init(AVCodecContext *avctx)
if (!done) {
for(i=0;i<NB_RL_TABLES;i++) {
- ff_init_rl(&ff_rl_table[i], ff_static_rl_table_store[i]);
+ ff_rl_init(&ff_rl_table[i], ff_static_rl_table_store[i]);
}
INIT_VLC_RL(ff_rl_table[0], 642);
INIT_VLC_RL(ff_rl_table[1], 1104);
diff --git a/libavcodec/msmpeg4enc.c b/libavcodec/msmpeg4enc.c
index cd81c9486c..e138f087a2 100644
--- a/libavcodec/msmpeg4enc.c
+++ b/libavcodec/msmpeg4enc.c
@@ -137,7 +137,7 @@ av_cold int ff_msmpeg4_encode_init(MpegEncContext *s)
if ((ret = init_mv_table(&ff_mv_tables[1])) < 0)
return ret;
for(i=0;i<NB_RL_TABLES;i++)
- ff_init_rl(&ff_rl_table[i], ff_static_rl_table_store[i]);
+ ff_rl_init(&ff_rl_table[i], ff_static_rl_table_store[i]);
for(i=0; i<NB_RL_TABLES; i++){
int level;
diff --git a/libavcodec/rl.c b/libavcodec/rl.c
index 3dc8a541af..68122b7381 100644
--- a/libavcodec/rl.c
+++ b/libavcodec/rl.c
@@ -22,7 +22,7 @@
#include "rl.h"
-av_cold void ff_init_rl(RLTable *rl,
+av_cold void ff_rl_init(RLTable *rl,
uint8_t static_store[2][2 * MAX_RUN + MAX_LEVEL + 3])
{
int8_t max_level[MAX_RUN + 1], max_run[MAX_LEVEL + 1];
@@ -74,7 +74,7 @@ av_cold void ff_init_rl(RLTable *rl,
}
}
-av_cold void ff_init_vlc_rl(RLTable *rl, unsigned static_size)
+av_cold void ff_rl_init_vlc(RLTable *rl, unsigned static_size)
{
int i, q;
VLC_TYPE table[1500][2] = {{0}};
diff --git a/libavcodec/rl.h b/libavcodec/rl.h
index 2897ec5aa1..086266e7f8 100644
--- a/libavcodec/rl.h
+++ b/libavcodec/rl.h
@@ -52,8 +52,8 @@ typedef struct RLTable {
* @param static_store static uint8_t array[2][2*MAX_RUN + MAX_LEVEL + 3] which will hold
* the level and run tables, if this is NULL av_malloc() will be used
*/
-void ff_init_rl(RLTable *rl, uint8_t static_store[2][2*MAX_RUN + MAX_LEVEL + 3]);
-void ff_init_vlc_rl(RLTable *rl, unsigned static_size);
+void ff_rl_init(RLTable *rl, uint8_t static_store[2][2*MAX_RUN + MAX_LEVEL + 3]);
+void ff_rl_init_vlc(RLTable *rl, unsigned static_size);
#define INIT_VLC_RL(rl, static_size)\
{\
@@ -64,7 +64,7 @@ void ff_init_vlc_rl(RLTable *rl, unsigned static_size);
for(q=0; q<32; q++)\
rl.rl_vlc[q]= rl_vlc_table[q];\
\
- ff_init_vlc_rl(&rl, static_size);\
+ ff_rl_init_vlc(&rl, static_size);\
}\
}