mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-29 02:42:21 +00:00
avcodec: Replace local extern declarations for tables with header #includes
This commit is contained in:
parent
aa2ba8c99e
commit
c591d4575a
@ -36,10 +36,9 @@
|
|||||||
#include "rdft.h"
|
#include "rdft.h"
|
||||||
#include "fmtconvert.h"
|
#include "fmtconvert.h"
|
||||||
#include "internal.h"
|
#include "internal.h"
|
||||||
|
#include "wma.h"
|
||||||
#include "libavutil/intfloat.h"
|
#include "libavutil/intfloat.h"
|
||||||
|
|
||||||
extern const uint16_t ff_wma_critical_freqs[25];
|
|
||||||
|
|
||||||
static float quant_table[96];
|
static float quant_table[96];
|
||||||
|
|
||||||
#define MAX_CHANNELS 2
|
#define MAX_CHANNELS 2
|
||||||
|
@ -53,6 +53,10 @@ extern VLC ff_h263_intra_MCBPC_vlc;
|
|||||||
extern VLC ff_h263_inter_MCBPC_vlc;
|
extern VLC ff_h263_inter_MCBPC_vlc;
|
||||||
extern VLC ff_h263_cbpy_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_h263_rl_inter;
|
||||||
|
|
||||||
extern RLTable ff_rl_intra_aic;
|
extern RLTable ff_rl_intra_aic;
|
||||||
|
@ -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 dquant doubled quantizer, it would be odd in case of VC-1 halfpq==1.
|
||||||
* @param quant_offset offset away from zero
|
* @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){
|
int ff_intrax8_decode_picture(IntraX8Context * const w, int dquant, int quant_offset){
|
||||||
MpegEncContext * const s= w->s;
|
MpegEncContext * const s= w->s;
|
||||||
int mb_xy;
|
int mb_xy;
|
||||||
|
@ -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 uint8_t ff_mpeg4_DCtab_chrom[13][2];
|
||||||
|
|
||||||
extern const uint16_t ff_mpeg4_intra_vlc[103][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;
|
extern RLTable ff_mpeg4_rl_intra;
|
||||||
|
|
||||||
/* Note this is identical to the intra rvlc except that it is reordered. */
|
/* Note this is identical to the intra rvlc except that it is reordered. */
|
||||||
|
@ -27,6 +27,8 @@
|
|||||||
* MSMPEG4 data tables.
|
* MSMPEG4 data tables.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "h263.h"
|
||||||
|
#include "mpeg4video.h"
|
||||||
#include "msmpeg4data.h"
|
#include "msmpeg4data.h"
|
||||||
|
|
||||||
uint32_t ff_v2_dc_lum_table[512][2];
|
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,
|
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] = {
|
RLTable ff_rl_table[NB_RL_TABLES] = {
|
||||||
/* intra luminance tables */
|
/* intra luminance tables */
|
||||||
/* low motion */
|
/* low motion */
|
||||||
|
@ -34,6 +34,7 @@
|
|||||||
|
|
||||||
#include "avcodec.h"
|
#include "avcodec.h"
|
||||||
#include "get_bits.h"
|
#include "get_bits.h"
|
||||||
|
#include "h263.h"
|
||||||
#include "hpeldsp.h"
|
#include "hpeldsp.h"
|
||||||
#include "internal.h"
|
#include "internal.h"
|
||||||
#include "mathops.h"
|
#include "mathops.h"
|
||||||
@ -42,8 +43,6 @@
|
|||||||
#undef NDEBUG
|
#undef NDEBUG
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
extern const uint8_t ff_mvtab[33][2];
|
|
||||||
|
|
||||||
static VLC svq1_block_type;
|
static VLC svq1_block_type;
|
||||||
static VLC svq1_motion_component;
|
static VLC svq1_motion_component;
|
||||||
static VLC svq1_intra_multistage[6];
|
static VLC svq1_intra_multistage[6];
|
||||||
|
Loading…
Reference in New Issue
Block a user