]> git.sesse.net Git - ffmpeg/commitdiff
dnn/dnn_backend_native_layer_conv2d: Don't pretend convolution can fail
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>
Wed, 10 Mar 2021 20:58:15 +0000 (21:58 +0100)
committerAndreas Rheinhardt <andreas.rheinhardt@gmail.com>
Thu, 11 Mar 2021 12:20:00 +0000 (13:20 +0100)
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>
libavfilter/dnn/dnn_backend_native_layer_conv2d.c

index 614e300046636f0dcf929c4778f7826260dd34d0..7a60aa6a4b783ffc8249c31d247ba95f73b2d7c6 100644 (file)
@@ -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);
     }