提交 ac6dd87c 编写于 作者: 郭叶军's avatar 郭叶军 提交者: Paul B Mahol

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

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: 郭叶军's avatarGuo, Yejun <yejun.guo@intel.com>
上级 d3d99a0a
......@@ -243,8 +243,8 @@ static int ssim_plane_16bit(AVFilterContext *ctx, void *arg,
const int max = td->max;
for (int c = 0; c < td->nb_components; c++) {
const uint8_t *main = td->main_data[c];
const uint8_t *ref = td->ref_data[c];
const uint8_t *main_data = td->main_data[c];
const uint8_t *ref_data = td->ref_data[c];
const int main_stride = td->main_linesize[c];
const int ref_stride = td->ref_linesize[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 (; z <= y; z++) {
FFSWAP(void*, sum0, sum1);
ssim_4x4xn_16bit(&main[4 * z * main_stride], main_stride,
&ref[4 * z * ref_stride], ref_stride,
ssim_4x4xn_16bit(&main_data[4 * z * main_stride], main_stride,
&ref_data[4 * z * ref_stride], ref_stride,
sum0, width);
}
......@@ -286,8 +286,8 @@ static int ssim_plane(AVFilterContext *ctx, void *arg,
SSIMDSPContext *dsp = td->dsp;
for (int c = 0; c < td->nb_components; c++) {
const uint8_t *main = td->main_data[c];
const uint8_t *ref = td->ref_data[c];
const uint8_t *main_data = td->main_data[c];
const uint8_t *ref_data = td->ref_data[c];
const int main_stride = td->main_linesize[c];
const int ref_stride = td->ref_linesize[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 (; z <= y; z++) {
FFSWAP(void*, sum0, sum1);
dsp->ssim_4x4_line(&main[4 * z * main_stride], main_stride,
&ref[4 * z * ref_stride], ref_stride,
dsp->ssim_4x4_line(&main_data[4 * z * main_stride], main_stride,
&ref_data[4 * z * ref_stride], ref_stride,
sum0, width);
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册