diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-05-28 01:54:09 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-05-28 01:54:09 +0000 |
| commit | c192426fd87326dd572999f6b483b1f6e02a3e33 (patch) | |
| tree | 04666c2db390983354d16b76dc70656952bb0b8d /libavcodec | |
| parent | 7a7718e38f7610de534eb0b4e21bb8736ab911f9 (diff) | |
| download | ffmpeg-c192426fd87326dd572999f6b483b1f6e02a3e33.tar.gz | |
Fix return type of ff_init_me().
Originally committed as revision 13487 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/motion_est.c | 4 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index b97b441305..d3877c0682 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -231,7 +231,7 @@ static int zero_cmp(void *s, uint8_t *a, uint8_t *b, int stride, int h){ static void zero_hpel(uint8_t *a, const uint8_t *b, int stride, int h){ } -void ff_init_me(MpegEncContext *s){ +int ff_init_me(MpegEncContext *s){ MotionEstContext * const c= &s->me; int cache_size= FFMIN(ME_MAP_SIZE>>ME_MAP_SHIFT, 1<<ME_MAP_SHIFT); int dia_size= FFMAX(FFABS(s->avctx->dia_size)&255, FFABS(s->avctx->pre_dia_size)&255); @@ -303,6 +303,8 @@ void ff_init_me(MpegEncContext *s){ } c->temp= c->scratchpad; + + return 0; } #if 0 diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index b18b52dd5c..ab56d92c64 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -741,7 +741,7 @@ int ff_get_best_fcode(MpegEncContext * s, int16_t (*mv_table)[2], int type); void ff_fix_long_p_mvs(MpegEncContext * s); void ff_fix_long_mvs(MpegEncContext * s, uint8_t *field_select_table, int field_select, int16_t (*mv_table)[2], int f_code, int type, int truncate); -void ff_init_me(MpegEncContext *s); +int ff_init_me(MpegEncContext *s); int ff_pre_estimate_p_frame_motion(MpegEncContext * s, int mb_x, int mb_y); int ff_epzs_motion_search(MpegEncContext * s, int *mx_ptr, int *my_ptr, int P[10][2], int src_index, int ref_index, int16_t (*last_mv)[2], |