videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

Fix return type of ff_init_me(). 

Originally committed as revision 13487 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2008-05-28 01:54:09 +00:00
parent 7a7718e38f
commit c192426fd8
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/motion_est.c
View File

@ -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

2
libavcodec/mpegvideo.h
View File

@ -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],