diff options
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/binkaudio.c | 3 | ||||
-rw-r--r-- | libavcodec/h263.h | 4 | ||||
-rw-r--r-- | libavcodec/intrax8.c | 1 | ||||
-rw-r--r-- | libavcodec/mpeg4video.h | 3 | ||||
-rw-r--r-- | libavcodec/msmpeg4data.c | 10 | ||||
-rw-r--r-- | libavcodec/svq1dec.c | 3 |
6 files changed, 11 insertions, 13 deletions
diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c index 1e34ab9..d49964b 100644 --- a/libavcodec/binkaudio.c +++ b/libavcodec/binkaudio.c @@ -36,10 +36,9 @@ #include "rdft.h" #include "fmtconvert.h" #include "internal.h" +#include "wma.h" #include "libavutil/intfloat.h" -extern const uint16_t ff_wma_critical_freqs[25]; - static float quant_table[96]; #define MAX_CHANNELS 2 diff --git a/libavcodec/h263.h b/libavcodec/h263.h index dec660e..4f58f92 100644 --- a/libavcodec/h263.h +++ b/libavcodec/h263.h @@ -53,6 +53,10 @@ extern VLC ff_h263_intra_MCBPC_vlc; extern VLC ff_h263_inter_MCBPC_vlc; extern VLC ff_h263_cbpy_vlc; +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 RLTable ff_h263_rl_inter; extern RLTable ff_rl_intra_aic; diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c index b81a9ca..0cad9da 100644 --- a/libavcodec/intrax8.c +++ b/libavcodec/intrax8.c @@ -724,7 +724,6 @@ av_cold void ff_intrax8_common_end(IntraX8Context * w) * @param dquant doubled quantizer, it would be odd in case of VC-1 halfpq==1. * @param quant_offset offset away from zero */ -//FIXME extern uint8_t ff_wmv3_dc_scale_table[32]; int ff_intrax8_decode_picture(IntraX8Context * const w, int dquant, int quant_offset){ MpegEncContext * const s= w->s; int mb_xy; diff --git a/libavcodec/mpeg4video.h b/libavcodec/mpeg4video.h index ae3880f..214aa81 100644 --- a/libavcodec/mpeg4video.h +++ b/libavcodec/mpeg4video.h @@ -63,6 +63,9 @@ extern const uint8_t ff_mpeg4_DCtab_lum[13][2]; extern const uint8_t ff_mpeg4_DCtab_chrom[13][2]; 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]; + extern RLTable ff_mpeg4_rl_intra; /* Note this is identical to the intra rvlc except that it is reordered. */ diff --git a/libavcodec/msmpeg4data.c b/libavcodec/msmpeg4data.c index 5721d8f..cf291af 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 */ diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c index 4b8b656..59233a0 100644 --- a/libavcodec/svq1dec.c +++ b/libavcodec/svq1dec.c @@ -34,6 +34,7 @@ #include "avcodec.h" #include "get_bits.h" +#include "h263.h" #include "hpeldsp.h" #include "internal.h" #include "mathops.h" @@ -42,8 +43,6 @@ #undef NDEBUG #include <assert.h> -extern const uint8_t ff_mvtab[33][2]; - static VLC svq1_block_type; static VLC svq1_motion_component; static VLC svq1_intra_multistage[6]; |