diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-17 19:35:03 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-17 19:35:03 +0100 |
| commit | 9d4799c247e305ab480198e4942d229a2949ea9b (patch) | |
| tree | 578dda879d68c9a03a5969bfd1c4e8334144e336 /libavcodec/motion_est_template.c | |
| parent | 61400a1dc751c82cf6f33a7510c3804b7b201f25 (diff) | |
| parent | 8dead2aaca4aa8b84b77b05745755afb56b7d37a (diff) | |
| download | ffmpeg-9d4799c247e305ab480198e4942d229a2949ea9b.tar.gz | |
Merge commit '8dead2aaca4aa8b84b77b05745755afb56b7d37a'
* commit '8dead2aaca4aa8b84b77b05745755afb56b7d37a':
Move const qualifier before type name
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/motion_est_template.c')
| -rw-r--r-- | libavcodec/motion_est_template.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/motion_est_template.c b/libavcodec/motion_est_template.c index 9f6b2c26fc..ec5e6eda56 100644 --- a/libavcodec/motion_est_template.c +++ b/libavcodec/motion_est_template.c @@ -413,7 +413,7 @@ if( (y)>(ymax<<(S)) ) av_log(NULL, AV_LOG_ERROR, "%d %d %d %d %d ymax" #v, ymax, const int shift= 1+qpel;\ static av_always_inline int small_diamond_search(MpegEncContext * s, int *best, int dmin, - int src_index, int ref_index, int const penalty_factor, + int src_index, int ref_index, const int penalty_factor, int size, int h, int flags) { MotionEstContext * const c= &s->me; @@ -454,7 +454,7 @@ static av_always_inline int small_diamond_search(MpegEncContext * s, int *best, } static int funny_diamond_search(MpegEncContext * s, int *best, int dmin, - int src_index, int ref_index, int const penalty_factor, + int src_index, int ref_index, const int penalty_factor, int size, int h, int flags) { MotionEstContext * const c= &s->me; @@ -496,7 +496,7 @@ static int funny_diamond_search(MpegEncContext * s, int *best, int dmin, } static int hex_search(MpegEncContext * s, int *best, int dmin, - int src_index, int ref_index, int const penalty_factor, + int src_index, int ref_index, const int penalty_factor, int size, int h, int flags, int dia_size) { MotionEstContext * const c= &s->me; @@ -530,7 +530,7 @@ static int hex_search(MpegEncContext * s, int *best, int dmin, } static int l2s_dia_search(MpegEncContext * s, int *best, int dmin, - int src_index, int ref_index, int const penalty_factor, + int src_index, int ref_index, const int penalty_factor, int size, int h, int flags) { MotionEstContext * const c= &s->me; @@ -568,7 +568,7 @@ static int l2s_dia_search(MpegEncContext * s, int *best, int dmin, } static int umh_search(MpegEncContext * s, int *best, int dmin, - int src_index, int ref_index, int const penalty_factor, + int src_index, int ref_index, const int penalty_factor, int size, int h, int flags) { MotionEstContext * const c= &s->me; @@ -615,7 +615,7 @@ static int umh_search(MpegEncContext * s, int *best, int dmin, } static int full_search(MpegEncContext * s, int *best, int dmin, - int src_index, int ref_index, int const penalty_factor, + int src_index, int ref_index, const int penalty_factor, int size, int h, int flags) { MotionEstContext * const c= &s->me; @@ -678,7 +678,7 @@ static int full_search(MpegEncContext * s, int *best, int dmin, #define MAX_SAB_SIZE ME_MAP_SIZE static int sab_diamond_search(MpegEncContext * s, int *best, int dmin, - int src_index, int ref_index, int const penalty_factor, + int src_index, int ref_index, const int penalty_factor, int size, int h, int flags) { MotionEstContext * const c= &s->me; @@ -768,7 +768,7 @@ static int sab_diamond_search(MpegEncContext * s, int *best, int dmin, } static int var_diamond_search(MpegEncContext * s, int *best, int dmin, - int src_index, int ref_index, int const penalty_factor, + int src_index, int ref_index, const int penalty_factor, int size, int h, int flags) { MotionEstContext * const c= &s->me; @@ -829,7 +829,7 @@ static int var_diamond_search(MpegEncContext * s, int *best, int dmin, } static av_always_inline int diamond_search(MpegEncContext * s, int *best, int dmin, - int src_index, int ref_index, int const penalty_factor, + int src_index, int ref_index, const int penalty_factor, int size, int h, int flags){ MotionEstContext * const c= &s->me; if(c->dia_size==-1) |