Mercurial > libavcodec.hg
comparison h263.c @ 8739:037e54d6c9c3 libavcodec
Remove pointless '#if CONFIG_ENCODERS' around forward declarations.
| author | diego |
|---|---|
| date | Wed, 04 Feb 2009 20:36:37 +0000 |
| parents | e9d9d946f213 |
| children | 251c7a9cb795 |
comparison
equal
deleted
inserted
replaced
| 8738:08f9871b035b | 8739:037e54d6c9c3 |
|---|---|
| 53 #define MB_TYPE_B_VLC_BITS 4 | 53 #define MB_TYPE_B_VLC_BITS 4 |
| 54 #define TEX_VLC_BITS 9 | 54 #define TEX_VLC_BITS 9 |
| 55 #define H263_MBTYPE_B_VLC_BITS 6 | 55 #define H263_MBTYPE_B_VLC_BITS 6 |
| 56 #define CBPC_B_VLC_BITS 3 | 56 #define CBPC_B_VLC_BITS 3 |
| 57 | 57 |
| 58 #if CONFIG_ENCODERS | |
| 59 static void h263_encode_block(MpegEncContext * s, DCTELEM * block, | 58 static void h263_encode_block(MpegEncContext * s, DCTELEM * block, |
| 60 int n); | 59 int n); |
| 61 static void h263p_encode_umotion(MpegEncContext * s, int val); | 60 static void h263p_encode_umotion(MpegEncContext * s, int val); |
| 62 static inline void mpeg4_encode_block(MpegEncContext * s, DCTELEM * block, | 61 static inline void mpeg4_encode_block(MpegEncContext * s, DCTELEM * block, |
| 63 int n, int dc, uint8_t *scan_table, | 62 int n, int dc, uint8_t *scan_table, |
| 64 PutBitContext *dc_pb, PutBitContext *ac_pb); | 63 PutBitContext *dc_pb, PutBitContext *ac_pb); |
| 65 static int mpeg4_get_block_length(MpegEncContext * s, DCTELEM * block, int n, int intra_dc, | 64 static int mpeg4_get_block_length(MpegEncContext * s, DCTELEM * block, int n, int intra_dc, |
| 66 uint8_t *scan_table); | 65 uint8_t *scan_table); |
| 67 #endif | |
| 68 | 66 |
| 69 static int h263_decode_motion(MpegEncContext * s, int pred, int fcode); | 67 static int h263_decode_motion(MpegEncContext * s, int pred, int fcode); |
| 70 static int h263p_decode_umotion(MpegEncContext * s, int pred); | 68 static int h263p_decode_umotion(MpegEncContext * s, int pred); |
| 71 static int h263_decode_block(MpegEncContext * s, DCTELEM * block, | 69 static int h263_decode_block(MpegEncContext * s, DCTELEM * block, |
| 72 int n, int coded); | 70 int n, int coded); |
| 73 static inline int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr); | 71 static inline int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr); |
| 74 static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block, | 72 static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block, |
| 75 int n, int coded, int intra, int rvlc); | 73 int n, int coded, int intra, int rvlc); |
| 76 #if CONFIG_ENCODERS | 74 |
| 77 static int h263_pred_dc(MpegEncContext * s, int n, int16_t **dc_val_ptr); | 75 static int h263_pred_dc(MpegEncContext * s, int n, int16_t **dc_val_ptr); |
| 78 static void mpeg4_encode_visual_object_header(MpegEncContext * s); | 76 static void mpeg4_encode_visual_object_header(MpegEncContext * s); |
| 79 static void mpeg4_encode_vol_header(MpegEncContext * s, int vo_number, int vol_number); | 77 static void mpeg4_encode_vol_header(MpegEncContext * s, int vo_number, int vol_number); |
| 80 #endif //CONFIG_ENCODERS | 78 |
| 81 static void mpeg4_decode_sprite_trajectory(MpegEncContext * s, GetBitContext *gb); | 79 static void mpeg4_decode_sprite_trajectory(MpegEncContext * s, GetBitContext *gb); |
| 82 static inline int ff_mpeg4_pred_dc(MpegEncContext * s, int n, int level, int *dir_ptr, int encoding); | 80 static inline int ff_mpeg4_pred_dc(MpegEncContext * s, int n, int level, int *dir_ptr, int encoding); |
| 83 | 81 |
| 84 #if CONFIG_ENCODERS | 82 #if CONFIG_ENCODERS |
| 85 static uint8_t uni_DCtab_lum_len[512]; | 83 static uint8_t uni_DCtab_lum_len[512]; |