From 5ddd075daf15f631ce6607701e6925bea907ca1e Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sun, 27 Dec 2009 14:28:43 +0000 Subject: [PATCH] =?utf8?q?cosmetics:=20Move=20a=20bunch=20of=20forward=20d?= =?utf8?q?eclarations=20below=20a=20CONFIG=5FENCODERS=20#ifdef.=20This=20a?= =?utf8?q?voids=20a=20bunch=20of=20"=E2=80=98foo=E2=80=99=20declared=20?= =?utf8?q?=E2=80=98static=E2=80=99=20but=20never=20defined"=20warnings=20w?= =?utf8?q?hen=20compiling=20with=20encoders=20disabled.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Originally committed as revision 20937 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/h263.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/libavcodec/h263.c b/libavcodec/h263.c index de76792..4f90e04 100644 --- a/libavcodec/h263.c +++ b/libavcodec/h263.c @@ -56,15 +56,6 @@ #define H263_MBTYPE_B_VLC_BITS 6 #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 h263p_decode_umotion(MpegEncContext * s, int pred); 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); static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block, 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 inline int ff_mpeg4_pred_dc(MpegEncContext * s, int n, int level, int *dir_ptr, int encoding); #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_chrom_len[512]; static uint16_t uni_DCtab_lum_bits[512]; -- 2.7.4