aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/msmpeg4data.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-16 13:01:37 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-16 13:01:44 +0200
commitb7a025092f818e9fe5c63b36fb276654dd59d211 (patch)
treeac9b7d96687213b4db18d6f4593ff44a4ae1e7e9 /libavcodec/msmpeg4data.c
parentc14fc4585c2b8636ae0609582456c78097ea82c9 (diff)
parentc591d4575a6f97fbbe6145304b1ea960e8e81e14 (diff)
downloadffmpeg-b7a025092f818e9fe5c63b36fb276654dd59d211.tar.gz
Merge commit 'c591d4575a6f97fbbe6145304b1ea960e8e81e14'
* commit 'c591d4575a6f97fbbe6145304b1ea960e8e81e14': avcodec: Replace local extern declarations for tables with header #includes Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/msmpeg4data.c')
-rw-r--r--libavcodec/msmpeg4data.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/libavcodec/msmpeg4data.c b/libavcodec/msmpeg4data.c
index 50ba18c8cc..8eb07e95cb 100644
--- a/libavcodec/msmpeg4data.c
+++ b/libavcodec/msmpeg4data.c
@@ -27,6 +27,8 @@
* MSMPEG4 data tables.
*/
+#include "h263.h"
+#include "mpeg4video.h"
#include "msmpeg4data.h"
uint32_t ff_v2_dc_lum_table[512][2];
@@ -596,14 +598,6 @@ static const int8_t table4_run[168] = {
29, 30, 31, 32, 33, 34, 35, 36,
};
-extern const uint16_t ff_inter_vlc[103][2];
-extern const int8_t ff_inter_level[102];
-extern const int8_t ff_inter_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 ff_rl_table[NB_RL_TABLES] = {
/* intra luminance tables */
/* low motion */