diff options
| -rw-r--r-- | libavcodec/h263.c | 1 | ||||
| -rw-r--r-- | libavcodec/mdec.c | 1 | ||||
| -rw-r--r-- | libavcodec/motion_est.c | 2 | ||||
| -rw-r--r-- | libavcodec/motion_est_template.c | 2 | ||||
| -rw-r--r-- | libavcodec/vcr1.c | 6 |
5 files changed, 4 insertions, 8 deletions
diff --git a/libavcodec/h263.c b/libavcodec/h263.c index 592e92c7b1..46ed231ffd 100644 --- a/libavcodec/h263.c +++ b/libavcodec/h263.c @@ -563,7 +563,6 @@ void mpeg4_encode_mb(MpegEncContext * s, int motion_x, int motion_y) { int cbpc, cbpy, pred_x, pred_y; - int bits; PutBitContext * const pb2 = s->data_partitioning ? &s->pb2 : &s->pb; PutBitContext * const tex_pb = s->data_partitioning && s->pict_type!=B_TYPE ? &s->tex_pb : &s->pb; PutBitContext * const dc_pb = s->data_partitioning && s->pict_type!=I_TYPE ? &s->pb2 : &s->pb; diff --git a/libavcodec/mdec.c b/libavcodec/mdec.c index 176ee9b8f7..5416ad963c 100644 --- a/libavcodec/mdec.c +++ b/libavcodec/mdec.c @@ -249,7 +249,6 @@ static void mdec_common_init(AVCodecContext *avctx){ static int decode_init(AVCodecContext *avctx){ MDECContext * const a = avctx->priv_data; AVFrame *p= (AVFrame*)&a->picture; - int i; mdec_common_init(avctx); init_vlcs(); diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index 505a97d83d..71f685e786 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -393,6 +393,7 @@ void ff_init_me(MpegEncContext *s){ } } +#if 0 static int pix_dev(uint8_t * pix, int line_size, int mean) { int s, i, j; @@ -414,6 +415,7 @@ static int pix_dev(uint8_t * pix, int line_size, int mean) } return s; } +#endif static inline void no_motion_search(MpegEncContext * s, int *mx_ptr, int *my_ptr) diff --git a/libavcodec/motion_est_template.c b/libavcodec/motion_est_template.c index 546509e531..db51d676db 100644 --- a/libavcodec/motion_est_template.c +++ b/libavcodec/motion_est_template.c @@ -186,7 +186,9 @@ static int RENAME(hpel_motion_search)(MpegEncContext * s, #if 1 int key; int map_generation= s->me.map_generation; +#ifndef NDEBUG uint32_t *map= s->me.map; +#endif key= ((my-1)<<ME_MAP_MV_BITS) + (mx) + map_generation; assert(map[(index-(1<<ME_MAP_SHIFT))&(ME_MAP_SIZE-1)] == key); key= ((my+1)<<ME_MAP_MV_BITS) + (mx) + map_generation; diff --git a/libavcodec/vcr1.c b/libavcodec/vcr1.c index 18e250dd6b..4905c703f1 100644 --- a/libavcodec/vcr1.c +++ b/libavcodec/vcr1.c @@ -150,9 +150,6 @@ static void common_init(AVCodecContext *avctx){ } static int decode_init(AVCodecContext *avctx){ - VCR1Context * const a = avctx->priv_data; - AVFrame *p= (AVFrame*)&a->picture; - int i; common_init(avctx); @@ -162,8 +159,6 @@ static int decode_init(AVCodecContext *avctx){ } static int encode_init(AVCodecContext *avctx){ - VCR1Context * const a = avctx->priv_data; - int i; common_init(avctx); @@ -171,7 +166,6 @@ static int encode_init(AVCodecContext *avctx){ } static int decode_end(AVCodecContext *avctx){ - VCR1Context * const a = avctx->priv_data; avcodec_default_free_buffers(avctx); |