diff options
author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-03-10 21:58:15 +0100 |
---|---|---|
committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-03-11 13:20:00 +0100 |
commit | 723ebf029a94fc23f239dd319c7f1d5921a72cd7 (patch) | |
tree | 811a08d0a5fa4c1860e5d059be9ab27ea61905f3 | |
parent | 9da96d8b6908dbec55bd9657f7edc8a4f16a90ee (diff) | |
download | ffmpeg-723ebf029a94fc23f239dd319c7f1d5921a72cd7.tar.gz |
dnn/dnn_backend_native_layer_conv2d: Don't pretend convolution can fail
It can't; these are just remnants of commit
3c7cad69f233252e5178f7732baa0da950d74bbd which let the worker threads
do the reallocation.
Reviewed-by: Guo, Yejun <yejun.guo@intel.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
-rw-r--r-- | libavfilter/dnn/dnn_backend_native_layer_conv2d.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavfilter/dnn/dnn_backend_native_layer_conv2d.c b/libavfilter/dnn/dnn_backend_native_layer_conv2d.c index 614e300046..7a60aa6a4b 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_conv2d.c +++ b/libavfilter/dnn/dnn_backend_native_layer_conv2d.c @@ -180,7 +180,7 @@ static void * dnn_execute_layer_conv2d_thread(void *threadarg) output += conv_params->output_num; } } - return (void *)DNN_SUCCESS; + return NULL; } @@ -244,7 +244,6 @@ int ff_dnn_execute_layer_conv2d(DnnOperand *operands, const int32_t *input_opera } } - //join threads, res gets function return for (int i = 0; i < thread_num; i++){ pthread_join(thread_param[i].thread, NULL); } |