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/msmpeg4dec.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/msmpeg4dec.c')
| -rw-r--r-- | libavcodec/msmpeg4dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |