diff options
author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-08-21 13:47:27 +0200 |
---|---|---|
committer | Guo, Yejun <yejun.guo@intel.com> | 2020-08-21 22:12:39 +0800 |
commit | 128e6df1cd79076e3d5f51bbc88607b3d1c62689 (patch) | |
tree | a2df37fcf6cb1c5455fa45f582bdd95552a5898e | |
parent | d2206f0c5b77306ac6f6310fd0f02a412a6ebfe9 (diff) | |
download | ffmpeg-128e6df1cd79076e3d5f51bbc88607b3d1c62689.tar.gz |
dnn_backend_native_layer_avgpool: Fix invalid assignment, use av_assert
dnn_execute_layer_avg_pool() contains the following line:
assert(avgpool_params->padding_method = VALID);
This statement contains an assignment where obviously a comparison was
intended. Furthermore, *avgpool_params is const, so that the attempted
assignment leads to a compilation failure if asserts are enabled
(i.e. if DEBUG is defined which leads libavutil/internal.h to not define
NDEBUG). Moreover, the enumeration constant VALID actually has the value 0,
so that the assert would be triggered if a compiler compiles this with
asserts enabled. Finally, the statement uses assert() directly instead
of av_assert*().
All these errors have been fixed.
Thanks to ubitux for providing a FATE-box [1] where DEBUG is defined.
[1]: http://fate.ffmpeg.org/history.cgi?slot=x86_64-archlinux-gcc-ddebug
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Reviewed-by: Guo, Yejun <yejun.guo@intel.com>
-rw-r--r-- | libavfilter/dnn/dnn_backend_native_layer_avgpool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/dnn/dnn_backend_native_layer_avgpool.c b/libavfilter/dnn/dnn_backend_native_layer_avgpool.c index d745c35b4a..8d4d8db98c 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_avgpool.c +++ b/libavfilter/dnn/dnn_backend_native_layer_avgpool.c @@ -91,7 +91,7 @@ int dnn_execute_layer_avg_pool(DnnOperand *operands, const int32_t *input_operan output_height = ceil(height / (kernel_strides * 1.0)); output_width = ceil(width / (kernel_strides * 1.0)); } else { - assert(avgpool_params->padding_method = VALID); + av_assert0(avgpool_params->padding_method == VALID); height_end = height - avgpool_params->kernel_size + 1; width_end = width - avgpool_params->kernel_size + 1; height_radius = 0; |