virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

mpegvideo: remove some unused variables from MpegEncContext.

Browse Source
This commit is contained in:
Anton Khirnov
2011-10-18 19:53:25 +02:00
parent e71ebb1972
commit acffe45732
4 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/arm/asm-offsets.h
View File

@@ -29,11 +29,11 @@
#endif #endif
/* MpegEncContext */ /* MpegEncContext */
#define Y_DC_SCALE 0xac #define Y_DC_SCALE 0xa8
#define C_DC_SCALE 0xb0 #define C_DC_SCALE 0xac
#define AC_PRED 0xb4 #define AC_PRED 0xb0
#define BLOCK_LAST_INDEX 0xb8 #define BLOCK_LAST_INDEX 0xb4
#define H263_AIC 0xe8 #define H263_AIC 0xe4
#define INTER_SCANTAB_RASTER_END 0x130 #define INTER_SCANTAB_RASTER_END 0x12c
#endif /* AVCODEC_ARM_ASM_OFFSETS_H */ #endif /* AVCODEC_ARM_ASM_OFFSETS_H */

1
libavcodec/h264.c
View File

@@ -1033,7 +1033,6 @@ static av_cold void common_init(H264Context *h){
h->dequant_coeff_pps= -1; h->dequant_coeff_pps= -1;
s->unrestricted_mv=1; s->unrestricted_mv=1;
s->decode=1; //FIXME
dsputil_init(&s->dsp, s->avctx); // needed so that idct permutation is known early dsputil_init(&s->dsp, s->avctx); // needed so that idct permutation is known early

1
libavcodec/mpeg4videoenc.c
View File

@@ -1203,7 +1203,6 @@ static av_cold int encode_init(AVCodecContext *avctx)
s->inter_ac_vlc_length = uni_mpeg4_inter_rl_len; s->inter_ac_vlc_length = uni_mpeg4_inter_rl_len;
s->inter_ac_vlc_last_length= uni_mpeg4_inter_rl_len + 128*64; s->inter_ac_vlc_last_length= uni_mpeg4_inter_rl_len + 128*64;
s->luma_dc_vlc_length= uni_DCtab_lum_len; s->luma_dc_vlc_length= uni_DCtab_lum_len;
s->chroma_dc_vlc_length= uni_DCtab_chrom_len;
s->ac_esc_length= 7+2+1+6+1+12+1; s->ac_esc_length= 7+2+1+6+1+12+1;
s->y_dc_scale_table= ff_mpeg4_y_dc_scale_table; s->y_dc_scale_table= ff_mpeg4_y_dc_scale_table;
s->c_dc_scale_table= ff_mpeg4_c_dc_scale_table; s->c_dc_scale_table= ff_mpeg4_c_dc_scale_table;

5
libavcodec/mpegvideo.h
View File

@@ -234,7 +234,6 @@ typedef struct MpegEncContext {
int coded_picture_number; ///< used to set pic->coded_picture_number, should not be used for/by anything else int coded_picture_number; ///< used to set pic->coded_picture_number, should not be used for/by anything else
int picture_number; //FIXME remove, unclear definition int picture_number; //FIXME remove, unclear definition
int picture_in_gop_number; ///< 0-> first pic in gop, ... int picture_in_gop_number; ///< 0-> first pic in gop, ...
int b_frames_since_non_b; ///< used for encoding, relative to not yet reordered input
int mb_width, mb_height; ///< number of MBs horizontally & vertically int mb_width, mb_height; ///< number of MBs horizontally & vertically
int mb_stride; ///< mb_width+1 used for some arrays to allow simple addressing of left & top MBs without sig11 int mb_stride; ///< mb_width+1 used for some arrays to allow simple addressing of left & top MBs without sig11
int b8_stride; ///< 2*mb_width+1 used for some 8x8 block arrays to allow simple addressing int b8_stride; ///< 2*mb_width+1 used for some 8x8 block arrays to allow simple addressing
@@ -303,7 +302,6 @@ typedef struct MpegEncContext {
int last_dc[3]; ///< last DC values for MPEG1 int last_dc[3]; ///< last DC values for MPEG1
int16_t *dc_val_base; int16_t *dc_val_base;
int16_t *dc_val[3]; ///< used for mpeg4 DC prediction, all 3 arrays must be continuous int16_t *dc_val[3]; ///< used for mpeg4 DC prediction, all 3 arrays must be continuous
int16_t dc_cache[4*5];
const uint8_t *y_dc_scale_table; ///< qscale -> y_dc_scale table const uint8_t *y_dc_scale_table; ///< qscale -> y_dc_scale table
const uint8_t *c_dc_scale_table; ///< qscale -> c_dc_scale table const uint8_t *c_dc_scale_table; ///< qscale -> c_dc_scale table
const uint8_t *chroma_qscale_table; ///< qscale -> chroma_qscale (h263) const uint8_t *chroma_qscale_table; ///< qscale -> chroma_qscale (h263)
@@ -343,7 +341,6 @@ typedef struct MpegEncContext {
/* motion compensation */ /* motion compensation */
int unrestricted_mv; ///< mv can point outside of the coded picture int unrestricted_mv; ///< mv can point outside of the coded picture
int h263_long_vectors; ///< use horrible h263v1 long vector mode int h263_long_vectors; ///< use horrible h263v1 long vector mode
int decode; ///< if 0 then decoding will be skipped (for encoding b frames for example)
DSPContext dsp; ///< pointers for accelerated dsp functions DSPContext dsp; ///< pointers for accelerated dsp functions
int f_code; ///< forward MV resolution int f_code; ///< forward MV resolution
@@ -438,7 +435,6 @@ typedef struct MpegEncContext {
uint8_t *inter_ac_vlc_length; uint8_t *inter_ac_vlc_length;
uint8_t *inter_ac_vlc_last_length; uint8_t *inter_ac_vlc_last_length;
uint8_t *luma_dc_vlc_length; uint8_t *luma_dc_vlc_length;
uint8_t *chroma_dc_vlc_length;
#define UNI_AC_ENC_INDEX(run,level) ((run)*128 + (level)) #define UNI_AC_ENC_INDEX(run,level) ((run)*128 + (level))
int coded_score[8]; int coded_score[8];
@@ -458,7 +454,6 @@ typedef struct MpegEncContext {
void *opaque; ///< private data for the user void *opaque; ///< private data for the user
/* bit rate control */ /* bit rate control */
int64_t wanted_bits;
int64_t total_bits; int64_t total_bits;
int frame_bits; ///< bits used for the current frame int frame_bits; ///< bits used for the current frame
int next_lambda; ///< next lambda used for retrying to encode a frame int next_lambda; ///< next lambda used for retrying to encode a frame