Mercurial > libavcodec.hg
comparison motion_est.c @ 6917:167bd4bec8d1 libavcodec
Fix return type of ff_init_me().
| author | michael |
|---|---|
| date | Wed, 28 May 2008 01:54:09 +0000 |
| parents | 224b51e2c960 |
| children | 6aa2f54e6c98 |
comparison
equal
deleted
inserted
replaced
| 6916:603bdc5d8493 | 6917:167bd4bec8d1 |
|---|---|
| 229 } | 229 } |
| 230 | 230 |
| 231 static void zero_hpel(uint8_t *a, const uint8_t *b, int stride, int h){ | 231 static void zero_hpel(uint8_t *a, const uint8_t *b, int stride, int h){ |
| 232 } | 232 } |
| 233 | 233 |
| 234 void ff_init_me(MpegEncContext *s){ | 234 int ff_init_me(MpegEncContext *s){ |
| 235 MotionEstContext * const c= &s->me; | 235 MotionEstContext * const c= &s->me; |
| 236 int cache_size= FFMIN(ME_MAP_SIZE>>ME_MAP_SHIFT, 1<<ME_MAP_SHIFT); | 236 int cache_size= FFMIN(ME_MAP_SIZE>>ME_MAP_SHIFT, 1<<ME_MAP_SHIFT); |
| 237 int dia_size= FFMAX(FFABS(s->avctx->dia_size)&255, FFABS(s->avctx->pre_dia_size)&255); | 237 int dia_size= FFMAX(FFABS(s->avctx->dia_size)&255, FFABS(s->avctx->pre_dia_size)&255); |
| 238 | 238 |
| 239 if(FFMIN(s->avctx->dia_size, s->avctx->pre_dia_size) < -ME_MAP_SIZE){ | 239 if(FFMIN(s->avctx->dia_size, s->avctx->pre_dia_size) < -ME_MAP_SIZE){ |
| 301 if(s->codec_id == CODEC_ID_H261){ | 301 if(s->codec_id == CODEC_ID_H261){ |
| 302 c->sub_motion_search= no_sub_motion_search; | 302 c->sub_motion_search= no_sub_motion_search; |
| 303 } | 303 } |
| 304 | 304 |
| 305 c->temp= c->scratchpad; | 305 c->temp= c->scratchpad; |
| 306 | |
| 307 return 0; | |
| 306 } | 308 } |
| 307 | 309 |
| 308 #if 0 | 310 #if 0 |
| 309 static int pix_dev(uint8_t * pix, int line_size, int mean) | 311 static int pix_dev(uint8_t * pix, int line_size, int mean) |
| 310 { | 312 { |