[FFmpeg-devel] [PATCH] Make execute() and execute2() return FFMIN() of thread return codes

[Tomas Härdin]

fre 2022-06-17 klockan 01:38 +0200 skrev Michael Niedermayer:
> On Thu, Jun 16, 2022 at 11:04:01PM +0200, Tomas Härdin wrote:
> > tor 2022-06-16 klockan 20:27 +0200 skrev Michael Niedermayer:
> > > 
> > > >  
> > > >  void avpriv_slicethread_free(AVSliceThread **pctx)
> > > > @@ -236,8 +244,8 @@ void avpriv_slicethread_free(AVSliceThread
> > > > **pctx)
> > > >  #else /* HAVE_PTHREADS || HAVE_W32THREADS || HAVE_OS32THREADS
> > > > */
> > > >  
> > > >  int avpriv_slicethread_create(AVSliceThread **pctx, void
> > > > *priv,
> > > > -                              void (*worker_func)(void *priv,
> > > > int
> > > > jobnr, int threadnr, int nb_jobs, int nb_threads),
> > > > -                              void (*main_func)(void *priv),
> > > > +                              int (*worker_func)(void *priv,
> > > > int
> > > > jobnr, int threadnr, int nb_jobs, int nb_threads),
> > > > +                              int (*main_func)(void *priv),
> > > >                                int nb_threads)
> > > >  {
> > > >      *pctx = NULL;
> > > 
> > > You forgot to update the fallback code when threads are disabled
> > 
> > Uhm, the existing code just abort()s if threads are disabled? I'm
> > not
> > really sure if there anything that can or should be done there
> 
> Before your patches fate passes with --disable-pthreads
> afterwards it will fail during build because the function mismatches,
> the abort should not be reachable i hope

Updated patch attached

/Tomas
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Make-execute-and-execute2-return-FFMIN-of-thread-ret.patch
Type: text/x-patch
Size: 14115 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20220617/e3ce7913/attachment.bin>