diff options
| author | Eric Lasota <riot@icculus.org> | 2007-06-11 07:57:15 +0000 |
|---|---|---|
| committer | Benoit Fouet <benoit.fouet@free.fr> | 2007-06-11 07:57:15 +0000 |
| commit | 7c68b47b7881525eb2660a261cd24f41a19488cc (patch) | |
| tree | c668d157441a9322d008b8f1372b22e22387f68c /libavcodec/elbg.c | |
| parent | b8d4082552c0d1ea2268325ff23cb3d68db8f91c (diff) | |
Cygwin compatibility workaround
patch by Eric Lasota: [ riot icculus org ]
original thread: [FFmpeg-devel] [PATCH] elbg.c Cygwin compatibility workaround
date: 06/09/2007 09:26 AM
Originally committed as revision 9279 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/elbg.c')
| -rw-r--r-- | libavcodec/elbg.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/elbg.c b/libavcodec/elbg.c index c2393e70ba..6cd71a28bc 100644 --- a/libavcodec/elbg.c +++ b/libavcodec/elbg.c @@ -115,7 +115,7 @@ static int get_high_utility_cell(elbg_data *elbg) * Implementation of the simple LBG algorithm for just two codebooks */ static int simple_lbg(int dim, - int centroid[3][dim], + int *centroid[3], int newutility[3], int *points, cell *cells) @@ -186,7 +186,7 @@ static void get_new_centroids(elbg_data *elbg, int huc, int *newcentroid_i, * @param newcentroid A vector with the position of the new centroids */ static void shift_codebook(elbg_data *elbg, int *indexes, - int newcentroid[3][elbg->dim]) + int *newcentroid[3]) { cell *tempdata; cell **pp = &elbg->cells[indexes[2]]; @@ -246,6 +246,7 @@ static void try_shift_candidate(elbg_data *elbg, int idx[3]) int j, k, olderror=0, newerror, cont=0; int newutility[3]; int newcentroid[3][elbg->dim]; + int *newcentroid_ptrs[3] = { newcentroid[0], newcentroid[1], newcentroid[2] }; cell *tempcell; for (j=0; j<3; j++) @@ -269,11 +270,11 @@ static void try_shift_candidate(elbg_data *elbg, int idx[3]) newerror = newutility[2]; - newerror += simple_lbg(elbg->dim, newcentroid, newutility, elbg->points, + newerror += simple_lbg(elbg->dim, newcentroid_ptrs, newutility, elbg->points, elbg->cells[idx[1]]); if (olderror > newerror) { - shift_codebook(elbg, idx, newcentroid); + shift_codebook(elbg, idx, newcentroid_ptrs); elbg->error += newerror - olderror; |