[FFmpeg-devel] [PATCH 03/18] pthread_frame: merge the functionality for normal decoder init and init_thread_copy

[Michael Niedermayer]

On Fri, Mar 13, 2020 at 03:27:53PM -0300, James Almer wrote:
> On 3/13/2020 7:28 AM, Anton Khirnov wrote:
> > diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c
> > index edc0f7911d..3e0b8f5db3 100644
> > --- a/libavcodec/wavpack.c
> > +++ b/libavcodec/wavpack.c
> > @@ -603,15 +603,6 @@ static av_cold int wv_alloc_frame_context(WavpackContext *c)
> >      return 0;
> >  }
> >  
> > -#if HAVE_THREADS
> > -static int init_thread_copy(AVCodecContext *avctx)
> > -{
> > -    WavpackContext *s = avctx->priv_data;
> > -    s->avctx = avctx;
> > -    return 0;
> > -}
> > -#endif
> > -
> 
> This chunk doesn't apply after 9a13ed522f and b3c46e26aa.
> 
> (libavcodec/mpeg4videodec.c also applies reporting an offset of -25
> lines, but that's harmless)

also having problems with this patch: heres the full output:
(I also get a "patch unexpectedly ends in middle of line" at the end)

and git totally refuses to apply this
Applying: pthread_frame: merge the functionality for normal decoder init and init_thread_copy
error: sha1 information is lacking or useless (libavcodec/vp9.c).
error: could not build fake ancestor
Patch failed at 0001 pthread_frame: merge the functionality for normal decoder init and init_thread_copy
Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

with patch -p1

patching file doc/multithreading.txt
patching file libavcodec/aic.c
patching file libavcodec/alac.c
patching file libavcodec/avcodec.h
patching file libavcodec/cfhd.c
patching file libavcodec/cllc.c
patching file libavcodec/dnxhddec.c
patching file libavcodec/exr.c
patching file libavcodec/ffv1dec.c
patching file libavcodec/flacdec.c
patching file libavcodec/h264dec.c
patching file libavcodec/hevcdec.c
Hunk #1 succeeded at 3530 (offset 24 lines).
Hunk #2 succeeded at 3548 (offset 24 lines).
Hunk #3 succeeded at 3587 (offset 24 lines).
patching file libavcodec/hqx.c
patching file libavcodec/huffyuvdec.c
patching file libavcodec/lagarith.c
patching file libavcodec/lcldec.c
patching file libavcodec/magicyuv.c
patching file libavcodec/mdec.c
patching file libavcodec/mimic.c
patching file libavcodec/mpeg4videodec.c
patching file libavcodec/pixlet.c
patching file libavcodec/pngdec.c
patching file libavcodec/proresdec2.c
patching file libavcodec/pthread_frame.c
patching file libavcodec/rv30.c
patching file libavcodec/rv34.c
patching file libavcodec/rv34.h
patching file libavcodec/rv40.c
patching file libavcodec/sheervideo.c
patching file libavcodec/takdec.c
patching file libavcodec/tiff.c
patching file libavcodec/tta.c
patching file libavcodec/vble.c
patching file libavcodec/vp3.c
patching file libavcodec/vp8.c
patching file libavcodec/vp9.c
Hunk #1 succeeded at 1744 (offset 7 lines).
Hunk #2 succeeded at 1803 (offset 7 lines).
patching file libavcodec/wavpack.c
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] y
Hunk #1 FAILED at 603.
Hunk #2 FAILED at 1155.
2 out of 2 hunks FAILED -- saving rejects to file libavcodec/wavpack.c.rej
patching file libavcodec/ylc.c
patch unexpectedly ends in middle of line

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Old school: Use the lowest level language in which you can solve the problem
            conveniently.
New school: Use the highest level language in which the latest supercomputer
            can solve the problem without the user falling asleep waiting.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20200313/655227ae/attachment.sig>