diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-01-13 17:54:50 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-01-29 07:32:36 +0100 |
| commit | 47318953ddfe8aa7dd00ad90bd21ea3a995e35d0 (patch) | |
| tree | 2608fb2ec5567e5df8bc23b859b46e4c6300a3d1 | |
| parent | 231fd1ed3932909a259da6df52fa3f756646aa3e (diff) | |
| download | ffmpeg-47318953ddfe8aa7dd00ad90bd21ea3a995e35d0.tar.gz | |
mpegvideo: remove some unused variables from Picture.
| -rw-r--r-- | libavcodec/motion_est.c | 2 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.h | 5 |
2 files changed, 0 insertions, 7 deletions
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index 9cf1203be0..3244ac06b9 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -1077,7 +1077,6 @@ void ff_estimate_p_frame_motion(MpegEncContext * s, vard = s->dsp.sse[0](NULL, pix, ppix, s->linesize, 16); pic->mc_mb_var[s->mb_stride * mb_y + mb_x] = (vard+128)>>8; -// pic->mb_cmp_score[s->mb_stride * mb_y + mb_x] = dmin; c->mc_mb_var_sum_temp += (vard+128)>>8; if(mb_type){ @@ -1156,7 +1155,6 @@ void ff_estimate_p_frame_motion(MpegEncContext * s, } } -// pic->mb_cmp_score[s->mb_stride * mb_y + mb_x] = dmin; set_p_mv_tables(s, mx, my, mb_type!=CANDIDATE_MB_TYPE_INTER4V); /* get intra luma score */ diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 567319c27b..a2a5d7b876 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -94,10 +94,6 @@ struct MpegEncContext; typedef struct Picture{ struct AVFrame f; - /** - * halfpel luma planes. - */ - uint8_t *interpolated[3]; int8_t *qscale_table_base; int16_t (*motion_val_base[2])[2]; uint32_t *mb_type_base; @@ -143,7 +139,6 @@ typedef struct Picture{ uint16_t *mb_var; ///< Table for MB variances uint16_t *mc_mb_var; ///< Table for motion compensated MB variances uint8_t *mb_mean; ///< Table for MB luminance - int32_t *mb_cmp_score; ///< Table for MB cmp scores, for mb decision FIXME remove int b_frame_score; /* */ struct MpegEncContext *owner2; ///< pointer to the MpegEncContext that allocated this picture int needs_realloc; ///< Picture needs to be reallocated (eg due to a frame size change) |