| Message ID | 20230228120745.1578-1-jamrial@gmail.com |
|---|---|
| State | Accepted |
| Commit | de133eaabaea4d508475e2d2073b7c50238a79ee |
| Headers | show |
| Series | [FFmpeg-devel] avcodec/pthread_frame: remove forgotten deprecation warning wrappers | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
Quoting James Almer (2023-02-28 13:07:45) > Missed in e0786a8e. > > Signed-off-by: James Almer <jamrial@gmail.com> > --- > libavcodec/pthread_frame.c | 2 -- > 1 file changed, 2 deletions(-) Looks obviously ok.
diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index d9d5afaa82..31785acbef 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -903,10 +903,8 @@ static int thread_get_buffer_internal(AVCodecContext *avctx, AVFrame *f, int fla return ff_get_buffer(avctx, f, flags); p = avctx->internal->thread_ctx; -FF_DISABLE_DEPRECATION_WARNINGS if (atomic_load(&p->state) != STATE_SETTING_UP && ffcodec(avctx->codec)->update_thread_context) { -FF_ENABLE_DEPRECATION_WARNINGS av_log(avctx, AV_LOG_ERROR, "get_buffer() cannot be called after ff_thread_finish_setup()\n"); return -1; }
Missed in e0786a8e. Signed-off-by: James Almer <jamrial@gmail.com> --- libavcodec/pthread_frame.c | 2 -- 1 file changed, 2 deletions(-)