[FFmpeg-devel] [PATCH 21/23] dnn/dnn_backend_native_layer_conv2d: Don't pretend convolution can fail

Andreas Rheinhardt andreas.rheinhardt at gmail.com
Wed Mar 10 23:54:44 EET 2021


It can't; these are just remnants of commit
3c7cad69f233252e5178f7732baa0da950d74bbd which let the worker threads
do the reallocation.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
---
 libavfilter/dnn/dnn_backend_native_layer_conv2d.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libavfilter/dnn/dnn_backend_native_layer_conv2d.c b/libavfilter/dnn/dnn_backend_native_layer_conv2d.c
index 44e5bdb5f7..f7f1ef9b6b 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);
     }
-- 
2.27.0



More information about the ffmpeg-devel mailing list