diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2023-09-18 03:13:52 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2023-09-18 12:35:54 +0200 |
| commit | 1046cfe347cec1121717eba3855142984da6a9db (patch) | |
| tree | 0ea0790dcda4f9191932e9301d94db59a3b461a5 | |
| parent | 0e6fdebd0d5dafa07b4963f6b8ea7690ca124887 (diff) | |
| download | ffmpeg-1046cfe347cec1121717eba3855142984da6a9db.tar.gz | |
avcodec/pthread_frame: Remove FF_API_SLICE_OFFSET
Since 432adca5fedcb277b9a715a723cfd40735ec58f8 no decoder
looks at the slice_count and slice_offset fields at all,
so there is no reason to synchronize them between the worker
and the user thread.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | libavcodec/pthread_frame.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index b53fb54906..59989831a3 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -426,22 +426,6 @@ FF_DISABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS #endif -#if FF_API_SLICE_OFFSET -FF_DISABLE_DEPRECATION_WARNINGS - if (src->slice_count && src->slice_offset) { - if (dst->slice_count < src->slice_count) { - int err = av_reallocp_array(&dst->slice_offset, src->slice_count, - sizeof(*dst->slice_offset)); - if (err < 0) - return err; - } - memcpy(dst->slice_offset, src->slice_offset, - src->slice_count * sizeof(*dst->slice_offset)); - } - dst->slice_count = src->slice_count; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - av_packet_unref(dst->internal->last_pkt_props); err = av_packet_copy_props(dst->internal->last_pkt_props, src->internal->last_pkt_props); if (err < 0) @@ -756,12 +740,6 @@ void ff_frame_thread_free(AVCodecContext *avctx, int thread_count) av_freep(&ctx->priv_data); } -#if FF_API_SLICE_OFFSET -FF_DISABLE_DEPRECATION_WARNINGS - av_freep(&ctx->slice_offset); -FF_ENABLE_DEPRECATION_WARNINGS -#endif - av_buffer_unref(&ctx->internal->pool); av_packet_free(&ctx->internal->last_pkt_props); av_freep(&ctx->internal); |