diff options
| author | Clément Bœsch <u@pkh.me> | 2016-06-21 21:55:20 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-06-21 21:55:34 +0200 |
| commit | 8ef57a0d6154119e1a616dd8c29e8c32e35808a0 (patch) | |
| tree | 26c51bc5d99260b44ba3a2585091ca764559f939 /libavcodec/motion_est_template.c | |
| parent | 373b82066cd4d0c7f42af9b03e8cdc1085e1a6e5 (diff) | |
| parent | 41ed7ab45fc693f7d7fc35664c0233f4c32d69bb (diff) | |
| download | ffmpeg-8ef57a0d6154119e1a616dd8c29e8c32e35808a0.tar.gz | |
Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'
* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb':
cosmetics: Fix spelling mistakes
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/motion_est_template.c')
| -rw-r--r-- | libavcodec/motion_est_template.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/motion_est_template.c b/libavcodec/motion_est_template.c index ec5e6eda56..0c21bbfe1a 100644 --- a/libavcodec/motion_est_template.c +++ b/libavcodec/motion_est_template.c @@ -429,7 +429,7 @@ static av_always_inline int small_diamond_search(MpegEncContext * s, int *best, { /* ensure that the best point is in the MAP as h/qpel refinement needs it */ const unsigned key = ((unsigned)best[1]<<ME_MAP_MV_BITS) + best[0] + map_generation; const int index= (((unsigned)best[1]<<ME_MAP_SHIFT) + best[0])&(ME_MAP_SIZE-1); - if(map[index]!=key){ //this will be executed only very rarey + if (map[index] != key) { // this will be executed only very rarely score_map[index]= cmp(s, best[0], best[1], 0, 0, size, h, ref_index, src_index, cmpf, chroma_cmpf, flags); map[index]= key; } @@ -758,7 +758,7 @@ static int sab_diamond_search(MpegEncContext * s, int *best, int dmin, if( best[0] < xmax && best[0] > xmin && best[1] < ymax && best[1] > ymin){ int d; - //ensure that the refernece samples for hpel refinement are in the map + // ensure that the reference samples for hpel refinement are in the map CHECK_MV(best[0]-1, best[1]) CHECK_MV(best[0]+1, best[1]) CHECK_MV(best[0], best[1]-1) @@ -871,7 +871,7 @@ static av_always_inline int epzs_motion_search_internal(MpegEncContext * s, int unsigned map_generation; int penalty_factor; const int ref_mv_stride= s->mb_stride; //pass as arg FIXME - const int ref_mv_xy= s->mb_x + s->mb_y*ref_mv_stride; //add to last_mv beforepassing FIXME + const int ref_mv_xy = s->mb_x + s->mb_y * ref_mv_stride; // add to last_mv before passing FIXME me_cmp_func cmpf, chroma_cmpf; LOAD_COMMON @@ -972,7 +972,7 @@ static av_always_inline int epzs_motion_search_internal(MpegEncContext * s, int return dmin; } -//this function is dedicated to the braindamaged gcc +//this function is dedicated to the brain damaged gcc 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], int ref_mv_scale, |