[FFmpeg-cvslog] avcodec/pthread_frame: Remove FF_API_SLICE_OFFSET
Andreas Rheinhardt
git at videolan.org
Mon Sep 18 13:40:41 EEST 2023
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Mon Sep 18 03:13:52 2023 +0200| [1046cfe347cec1121717eba3855142984da6a9db] | committer: Andreas Rheinhardt
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 at gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1046cfe347cec1121717eba3855142984da6a9db
---
libavcodec/pthread_frame.c | 22 ----------------------
1 file changed, 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
@@ -424,22 +424,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
FF_DISABLE_DEPRECATION_WARNINGS
dst->reordered_opaque = src->reordered_opaque;
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);
@@ -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);
More information about the ffmpeg-cvslog
mailing list