diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-01-08 17:41:14 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-01-08 17:41:14 +0000 |
| commit | fef59a5b4b8f83b940042b62399afe30fa126512 (patch) | |
| tree | fac2e00f3b38b5fa98ce88e508cad1c078ab57e9 /libavcodec/mpeg4videodec.c | |
| parent | 05b858b045fb0dc347c695e914b11fbc871150e5 (diff) | |
Rename mpeg4 intra vlc tables so they contain "mpeg4", this improves readability
of msmpeg4 code (one now knows where that table comes from).
Originally committed as revision 21097 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpeg4videodec.c')
| -rw-r--r-- | libavcodec/mpeg4videodec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 2ccfd44ed6..7a543069d1 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -872,8 +872,8 @@ static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block, rl = &rvlc_rl_intra; rl_vlc = rvlc_rl_intra.rl_vlc[0]; }else{ - rl = &rl_intra; - rl_vlc = rl_intra.rl_vlc[0]; + rl = &ff_mpeg4_rl_intra; + rl_vlc = ff_mpeg4_rl_intra.rl_vlc[0]; } if (s->ac_pred) { if (dc_pred_dir == 0) @@ -2200,10 +2200,10 @@ static av_cold int decode_init(AVCodecContext *avctx) if (!done) { done = 1; - init_rl(&rl_intra, ff_mpeg4_static_rl_table_store[0]); + init_rl(&ff_mpeg4_rl_intra, ff_mpeg4_static_rl_table_store[0]); init_rl(&rvlc_rl_inter, ff_mpeg4_static_rl_table_store[1]); init_rl(&rvlc_rl_intra, ff_mpeg4_static_rl_table_store[2]); - INIT_VLC_RL(rl_intra, 554); + INIT_VLC_RL(ff_mpeg4_rl_intra, 554); INIT_VLC_RL(rvlc_rl_inter, 1072); INIT_VLC_RL(rvlc_rl_intra, 1072); INIT_VLC_STATIC(&dc_lum, DC_VLC_BITS, 10 /* 13 */, |