Commit 5ddd075d authored by Diego Biurrun's avatar Diego Biurrun

cosmetics: Move a bunch of forward declarations below a CONFIG_ENCODERS #ifdef.

This avoids a bunch of "‘foo’ declared ‘static’ but never defined" warnings
when compiling with encoders disabled.

Originally committed as revision 20937 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent da937668
...@@ -56,15 +56,6 @@ ...@@ -56,15 +56,6 @@
#define H263_MBTYPE_B_VLC_BITS 6 #define H263_MBTYPE_B_VLC_BITS 6
#define CBPC_B_VLC_BITS 3 #define CBPC_B_VLC_BITS 3
static void h263_encode_block(MpegEncContext * s, DCTELEM * block,
int n);
static void h263p_encode_umotion(MpegEncContext * s, int val);
static inline void mpeg4_encode_block(MpegEncContext * s, DCTELEM * block,
int n, int dc, uint8_t *scan_table,
PutBitContext *dc_pb, PutBitContext *ac_pb);
static int mpeg4_get_block_length(MpegEncContext * s, DCTELEM * block, int n, int intra_dc,
uint8_t *scan_table);
static int h263_decode_motion(MpegEncContext * s, int pred, int fcode); static int h263_decode_motion(MpegEncContext * s, int pred, int fcode);
static int h263p_decode_umotion(MpegEncContext * s, int pred); static int h263p_decode_umotion(MpegEncContext * s, int pred);
static int h263_decode_block(MpegEncContext * s, DCTELEM * block, static int h263_decode_block(MpegEncContext * s, DCTELEM * block,
...@@ -73,14 +64,24 @@ static inline int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr); ...@@ -73,14 +64,24 @@ static inline int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr);
static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block, static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
int n, int coded, int intra, int rvlc); int n, int coded, int intra, int rvlc);
static int h263_pred_dc(MpegEncContext * s, int n, int16_t **dc_val_ptr);
static void mpeg4_encode_visual_object_header(MpegEncContext * s);
static void mpeg4_encode_vol_header(MpegEncContext * s, int vo_number, int vol_number);
static void mpeg4_decode_sprite_trajectory(MpegEncContext * s, GetBitContext *gb); static void mpeg4_decode_sprite_trajectory(MpegEncContext * s, GetBitContext *gb);
static inline int ff_mpeg4_pred_dc(MpegEncContext * s, int n, int level, int *dir_ptr, int encoding); static inline int ff_mpeg4_pred_dc(MpegEncContext * s, int n, int level, int *dir_ptr, int encoding);
#if CONFIG_ENCODERS #if CONFIG_ENCODERS
static void h263_encode_block(MpegEncContext *s, DCTELEM *block, int n);
static void h263p_encode_umotion(MpegEncContext *s, int val);
static int h263_pred_dc(MpegEncContext *s, int n, int16_t **dc_val_ptr);
static void mpeg4_encode_visual_object_header(MpegEncContext *s);
static void mpeg4_encode_vol_header(MpegEncContext *s, int vo_number,
int vol_number);
static inline void mpeg4_encode_block(MpegEncContext *s, DCTELEM *block,
int n, int dc, uint8_t *scan_table,
PutBitContext *dc_pb,
PutBitContext *ac_pb);
static int mpeg4_get_block_length(MpegEncContext *s, DCTELEM *block, int n,
int intra_dc, uint8_t *scan_table);
static uint8_t uni_DCtab_lum_len[512]; static uint8_t uni_DCtab_lum_len[512];
static uint8_t uni_DCtab_chrom_len[512]; static uint8_t uni_DCtab_chrom_len[512];
static uint16_t uni_DCtab_lum_bits[512]; static uint16_t uni_DCtab_lum_bits[512];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment