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

[James Almer]

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)

>  static av_cold int wavpack_decode_init(AVCodecContext *avctx)
>  {
>      WavpackContext *s = avctx->priv_data;
> @@ -1155,6 +1146,5 @@ AVCodec ff_wavpack_decoder = {
>      .close          = wavpack_decode_end,
>      .decode         = wavpack_decode_frame,
>      .flush          = wavpack_decode_flush,
> -    .init_thread_copy = ONLY_IF_THREADS_ENABLED(init_thread_copy),
>      .capabilities   = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS,
>  };