1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

removed unused variable

Originally committed as revision 2162 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Fabrice Bellard 2003-08-24 22:28:41 +00:00
parent acaa20d7bd
commit 802f454e5b
5 changed files with 4 additions and 8 deletions

View File

@ -563,7 +563,6 @@ void mpeg4_encode_mb(MpegEncContext * s,
int motion_x, int motion_y) int motion_x, int motion_y)
{ {
int cbpc, cbpy, pred_x, pred_y; int cbpc, cbpy, pred_x, pred_y;
int bits;
PutBitContext * const pb2 = s->data_partitioning ? &s->pb2 : &s->pb; 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 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; PutBitContext * const dc_pb = s->data_partitioning && s->pict_type!=I_TYPE ? &s->pb2 : &s->pb;

View File

@ -249,7 +249,6 @@ static void mdec_common_init(AVCodecContext *avctx){
static int decode_init(AVCodecContext *avctx){ static int decode_init(AVCodecContext *avctx){
MDECContext * const a = avctx->priv_data; MDECContext * const a = avctx->priv_data;
AVFrame *p= (AVFrame*)&a->picture; AVFrame *p= (AVFrame*)&a->picture;
int i;
mdec_common_init(avctx); mdec_common_init(avctx);
init_vlcs(); init_vlcs();

View File

@ -393,6 +393,7 @@ void ff_init_me(MpegEncContext *s){
} }
} }
#if 0
static int pix_dev(uint8_t * pix, int line_size, int mean) static int pix_dev(uint8_t * pix, int line_size, int mean)
{ {
int s, i, j; int s, i, j;
@ -414,6 +415,7 @@ static int pix_dev(uint8_t * pix, int line_size, int mean)
} }
return s; return s;
} }
#endif
static inline void no_motion_search(MpegEncContext * s, static inline void no_motion_search(MpegEncContext * s,
int *mx_ptr, int *my_ptr) int *mx_ptr, int *my_ptr)

View File

@ -186,7 +186,9 @@ static int RENAME(hpel_motion_search)(MpegEncContext * s,
#if 1 #if 1
int key; int key;
int map_generation= s->me.map_generation; int map_generation= s->me.map_generation;
#ifndef NDEBUG
uint32_t *map= s->me.map; uint32_t *map= s->me.map;
#endif
key= ((my-1)<<ME_MAP_MV_BITS) + (mx) + map_generation; key= ((my-1)<<ME_MAP_MV_BITS) + (mx) + map_generation;
assert(map[(index-(1<<ME_MAP_SHIFT))&(ME_MAP_SIZE-1)] == key); assert(map[(index-(1<<ME_MAP_SHIFT))&(ME_MAP_SIZE-1)] == key);
key= ((my+1)<<ME_MAP_MV_BITS) + (mx) + map_generation; key= ((my+1)<<ME_MAP_MV_BITS) + (mx) + map_generation;

View File

@ -150,9 +150,6 @@ static void common_init(AVCodecContext *avctx){
} }
static int decode_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); common_init(avctx);
@ -162,8 +159,6 @@ static int decode_init(AVCodecContext *avctx){
} }
static int encode_init(AVCodecContext *avctx){ static int encode_init(AVCodecContext *avctx){
VCR1Context * const a = avctx->priv_data;
int i;
common_init(avctx); common_init(avctx);
@ -171,7 +166,6 @@ static int encode_init(AVCodecContext *avctx){
} }
static int decode_end(AVCodecContext *avctx){ static int decode_end(AVCodecContext *avctx){
VCR1Context * const a = avctx->priv_data;
avcodec_default_free_buffers(avctx); avcodec_default_free_buffers(avctx);