summaryrefslogtreecommitdiff
path: root/libavcodec/msmpeg4data.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2010-01-08 17:41:14 +0000
committerMichael Niedermayer <michaelni@gmx.at>2010-01-08 17:41:14 +0000
commitfef59a5b4b8f83b940042b62399afe30fa126512 (patch)
treefac2e00f3b38b5fa98ce88e508cad1c078ab57e9 /libavcodec/msmpeg4data.c
parent05b858b045fb0dc347c695e914b11fbc871150e5 (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/msmpeg4data.c')
-rw-r--r--libavcodec/msmpeg4data.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/msmpeg4data.c b/libavcodec/msmpeg4data.c
index 003e3a60ee..b8544a8e20 100644
--- a/libavcodec/msmpeg4data.c
+++ b/libavcodec/msmpeg4data.c
@@ -596,9 +596,9 @@ extern const uint16_t inter_vlc[103][2];
extern const int8_t inter_level[102];
extern const int8_t inter_run[102];
-extern const uint16_t intra_vlc[103][2];
-extern const int8_t intra_level[102];
-extern const int8_t intra_run[102];
+extern const uint16_t ff_mpeg4_intra_vlc[103][2];
+extern const int8_t ff_mpeg4_intra_level[102];
+extern const int8_t ff_mpeg4_intra_run[102];
RLTable rl_table[NB_RL_TABLES] = {
/* intra luminance tables */
@@ -622,9 +622,9 @@ RLTable rl_table[NB_RL_TABLES] = {
{
102,
67,
- intra_vlc,
- intra_run,
- intra_level,
+ ff_mpeg4_intra_vlc,
+ ff_mpeg4_intra_run,
+ ff_mpeg4_intra_level,
},
/* intra chrominance / non intra tables */
/* low motion inter */