har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/vf_ssim.c: fix build warning for [-Wmain]

Browse Source 
The build warning message:
src/libavfilter/vf_ssim.c: In function ‘ssim_plane_16bit’:
src/libavfilter/vf_ssim.c:246:24: warning: ‘main’ is usually a function [-Wmain]
         const uint8_t *main = td->main_data[c];
                        ^~~~
src/libavfilter/vf_ssim.c: In function ‘ssim_plane’:
src/libavfilter/vf_ssim.c:289:24: warning: ‘main’ is usually a function [-Wmain]
         const uint8_t *main = td->main_data[c];
                        ^~~~

Signed-off-by: Guo, Yejun <yejun.guo@intel.com>
This commit is contained in:
Guo, Yejun 2021-02-25 14:38:11 +08:00 committed by Paul B Mahol
parent d3d99a0a06
commit ac6dd87cd1
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavfilter/vf_ssim.c
View File

@ -243,8 +243,8 @@ static int ssim_plane_16bit(AVFilterContext *ctx, void *arg,
const int max = td->max; const int max = td->max;
for (int c = 0; c < td->nb_components; c++) { for (int c = 0; c < td->nb_components; c++) {
const uint8_t *main = td->main_data[c]; const uint8_t *main_data = td->main_data[c];
const uint8_t *ref = td->ref_data[c]; const uint8_t *ref_data = td->ref_data[c];
const int main_stride = td->main_linesize[c]; const int main_stride = td->main_linesize[c];
const int ref_stride = td->ref_linesize[c]; const int ref_stride = td->ref_linesize[c];
int width = td->planewidth[c]; int width = td->planewidth[c];
@ -263,8 +263,8 @@ static int ssim_plane_16bit(AVFilterContext *ctx, void *arg,
for (int y = ystart; y < slice_end; y++) { for (int y = ystart; y < slice_end; y++) {
for (; z <= y; z++) { for (; z <= y; z++) {
FFSWAP(void*, sum0, sum1); FFSWAP(void*, sum0, sum1);
ssim_4x4xn_16bit(&main[4 * z * main_stride], main_stride, ssim_4x4xn_16bit(&main_data[4 * z * main_stride], main_stride,
&ref[4 * z * ref_stride], ref_stride, &ref_data[4 * z * ref_stride], ref_stride,
sum0, width); sum0, width);
} }
@ -286,8 +286,8 @@ static int ssim_plane(AVFilterContext *ctx, void *arg,
SSIMDSPContext *dsp = td->dsp; SSIMDSPContext *dsp = td->dsp;
for (int c = 0; c < td->nb_components; c++) { for (int c = 0; c < td->nb_components; c++) {
const uint8_t *main = td->main_data[c]; const uint8_t *main_data = td->main_data[c];
const uint8_t *ref = td->ref_data[c]; const uint8_t *ref_data = td->ref_data[c];
const int main_stride = td->main_linesize[c]; const int main_stride = td->main_linesize[c];
const int ref_stride = td->ref_linesize[c]; const int ref_stride = td->ref_linesize[c];
int width = td->planewidth[c]; int width = td->planewidth[c];
@ -306,8 +306,8 @@ static int ssim_plane(AVFilterContext *ctx, void *arg,
for (int y = ystart; y < slice_end; y++) { for (int y = ystart; y < slice_end; y++) {
for (; z <= y; z++) { for (; z <= y; z++) {
FFSWAP(void*, sum0, sum1); FFSWAP(void*, sum0, sum1);
dsp->ssim_4x4_line(&main[4 * z * main_stride], main_stride, dsp->ssim_4x4_line(&main_data[4 * z * main_stride], main_stride,
&ref[4 * z * ref_stride], ref_stride, &ref_data[4 * z * ref_stride], ref_stride,
sum0, width); sum0, width);
} }