diff options
Diffstat (limited to 'libavcodec/elbg.c')
| -rw-r--r-- | libavcodec/elbg.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/libavcodec/elbg.c b/libavcodec/elbg.c index 0aa8e16165..5c7018b475 100644 --- a/libavcodec/elbg.c +++ b/libavcodec/elbg.c @@ -1,20 +1,20 @@ /* * Copyright (C) 2007 Vitor Sessak <vitor1001@gmail.com> * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -25,6 +25,7 @@ #include <string.h> +#include "libavutil/avassert.h" #include "libavutil/common.h" #include "libavutil/lfg.h" #include "elbg.h" @@ -111,7 +112,7 @@ static int get_high_utility_cell(elbg_data *elbg) while (elbg->utility_inc[i] < r) i++; - assert(elbg->cells[i]); + av_assert2(elbg->cells[i]); return i; } @@ -189,7 +190,7 @@ static void get_new_centroids(elbg_data *elbg, int huc, int *newcentroid_i, /** * Add the points in the low utility cell to its closest cell. Split the high - * utility cell, putting the separed points in the (now empty) low utility + * utility cell, putting the separate points in the (now empty) low utility * cell. * * @param elbg Internal elbg data @@ -323,7 +324,7 @@ static void do_shiftings(elbg_data *elbg) #define BIG_PRIME 433494437LL -void ff_init_elbg(int *points, int dim, int numpoints, int *codebook, +void avpriv_init_elbg(int *points, int dim, int numpoints, int *codebook, int numCB, int max_steps, int *closest_cb, AVLFG *rand_state) { @@ -338,8 +339,8 @@ void ff_init_elbg(int *points, int dim, int numpoints, int *codebook, memcpy(temp_points + i*dim, points + k*dim, dim*sizeof(int)); } - ff_init_elbg(temp_points, dim, numpoints/8, codebook, numCB, 2*max_steps, closest_cb, rand_state); - ff_do_elbg(temp_points, dim, numpoints/8, codebook, numCB, 2*max_steps, closest_cb, rand_state); + avpriv_init_elbg(temp_points, dim, numpoints/8, codebook, numCB, 2*max_steps, closest_cb, rand_state); + avpriv_do_elbg(temp_points, dim, numpoints/8, codebook, numCB, 2*max_steps, closest_cb, rand_state); av_free(temp_points); @@ -350,7 +351,7 @@ void ff_init_elbg(int *points, int dim, int numpoints, int *codebook, } -void ff_do_elbg(int *points, int dim, int numpoints, int *codebook, +void avpriv_do_elbg(int *points, int dim, int numpoints, int *codebook, int numCB, int max_steps, int *closest_cb, AVLFG *rand_state) { |