diff options
author | Anton Khirnov <anton@khirnov.net> | 2015-05-22 21:50:12 +0300 |
---|---|---|
committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-05-28 17:38:43 +0300 |
commit | 6f57375d707de40dcec28d3cef886c364e032c21 (patch) | |
tree | 58753f9e09f0ad8fba6906c56a7c4dd76ad2516f /libavcodec | |
parent | fa1923f18205410a3b0aa6c0e77cb31443ef340d (diff) |
rl: Rename ff_*_rl() to ff_rl_*()
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/h261.c | 2 | ||||
-rw-r--r-- | libavcodec/ituh263dec.c | 4 | ||||
-rw-r--r-- | libavcodec/ituh263enc.c | 4 | ||||
-rw-r--r-- | libavcodec/mpeg12.c | 4 | ||||
-rw-r--r-- | libavcodec/mpeg12enc.c | 4 | ||||
-rw-r--r-- | libavcodec/mpeg4videodec.c | 6 | ||||
-rw-r--r-- | libavcodec/mpeg4videoenc.c | 2 | ||||
-rw-r--r-- | libavcodec/msmpeg4dec.c | 2 | ||||
-rw-r--r-- | libavcodec/msmpeg4enc.c | 2 | ||||
-rw-r--r-- | libavcodec/rl.c | 4 | ||||
-rw-r--r-- | libavcodec/rl.h | 6 |
11 files changed, 20 insertions, 20 deletions
diff --git a/libavcodec/h261.c b/libavcodec/h261.c index b9783f1510..bca7809773 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 a89e5d0a37..1f9ac27dd3 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -119,8 +119,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 87a37a056b..3afc238e35 100644 --- a/libavcodec/ituh263enc.c +++ b/libavcodec/ituh263enc.c @@ -772,8 +772,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 be5227f058..900761d9c9 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -164,8 +164,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 29438f3b92..7b27d857af 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -956,8 +956,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 8dbdbf9b13..7e36170d43 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -2567,9 +2567,9 @@ static av_cold int decode_init(AVCodecContext *avctx) if (!done) { done = 1; - 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 ab279dd849..c33bb4c58d 100644 --- a/libavcodec/mpeg4videoenc.c +++ b/libavcodec/mpeg4videoenc.c @@ -1295,7 +1295,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 ea770f9d5c..2fc2de1968 100644 --- a/libavcodec/msmpeg4dec.c +++ b/libavcodec/msmpeg4dec.c @@ -295,7 +295,7 @@ av_cold int ff_msmpeg4_decode_init(AVCodecContext *avctx) done = 1; 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 072f6fcf7b..631c167811 100644 --- a/libavcodec/msmpeg4enc.c +++ b/libavcodec/msmpeg4enc.c @@ -138,7 +138,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 516cb09275..942b7a6941 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) +av_cold void ff_rl_init_vlc(RLTable *rl) { int i, q; diff --git a/libavcodec/rl.h b/libavcodec/rl.h index 367cc986af..d03d4365a8 100644 --- a/libavcodec/rl.h +++ b/libavcodec/rl.h @@ -53,8 +53,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); +void ff_rl_init(RLTable *rl, uint8_t static_store[2][2*MAX_RUN + MAX_LEVEL + 3]); +void ff_rl_init_vlc(RLTable *rl); #define INIT_VLC_RL(rl, static_size)\ {\ @@ -68,7 +68,7 @@ void ff_init_vlc_rl(RLTable *rl); for(q=0; q<32; q++)\ rl.rl_vlc[q]= rl_vlc_table[q];\ \ - ff_init_vlc_rl(&rl);\ + ff_rl_init_vlc(&rl);\ }\ } |