diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-28 21:48:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-28 21:48:49 +0200 |
| commit | 75647622b530e8ec98ce364c9d6c38ca1b292e6d (patch) | |
| tree | 4dee7cfdf6f30f1239b577985bc22a7ca80c7e2a /libavcodec/rl.c | |
| parent | 68cce0101df074c41d2f4cfc8a9a36a000a8393e (diff) | |
| parent | 6f57375d707de40dcec28d3cef886c364e032c21 (diff) | |
| download | ffmpeg-75647622b530e8ec98ce364c9d6c38ca1b292e6d.tar.gz | |
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>
Diffstat (limited to 'libavcodec/rl.c')
| -rw-r--r-- | libavcodec/rl.c | 4 |
1 files changed, 2 insertions, 2 deletions
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}}; |