RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-27 18:02:11 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/thread: Remove ff_thread_get_format define

Browse Source 
Unnecessary since FF_API_THREAD_SAFE_CALLBACKS is no more.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2023-09-10 14:12:16 +02:00
parent 0058f6013f
commit 6434e44003
7 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/av1dec.c
View File

@ -613,7 +613,7 @@ static int get_pixel_format(AVCodecContext *avctx)
*fmtp++ = pix_fmt;
*fmtp = AV_PIX_FMT_NONE;
ret = ff_thread_get_format(avctx, pix_fmts);
ret = ff_get_format(avctx, pix_fmts);
/**
* check if the HW accel is inited correctly. If not, return un-implemented.

2
libavcodec/h264_slice.c
View File

@ -922,7 +922,7 @@ static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback)
for (int i = 0; pix_fmts[i] != AV_PIX_FMT_NONE; i++)
if (pix_fmts[i] == h->avctx->pix_fmt && !force_callback)
return pix_fmts[i];
return ff_thread_get_format(h->avctx, pix_fmts);
return ff_get_format(h->avctx, pix_fmts);
}
/* export coded and cropped frame dimensions to AVCodecContext */

2
libavcodec/hevcdec.c
View File

@ -521,7 +521,7 @@ static enum AVPixelFormat get_format(HEVCContext *s, const HEVCSPS *sps)
*fmt++ = sps->pix_fmt;
*fmt = AV_PIX_FMT_NONE;
return ff_thread_get_format(s->avctx, pix_fmts);
return ff_get_format(s->avctx, pix_fmts);
}
static int set_sps(HEVCContext *s, const HEVCSPS *sps,

2
libavcodec/mpeg12dec.c
View File

@ -1168,7 +1168,7 @@ static enum AVPixelFormat mpeg_get_pixelformat(AVCodecContext *avctx)
else
pix_fmts = mpeg12_pixfmt_list_444;
return ff_thread_get_format(avctx, pix_fmts);
return ff_get_format(avctx, pix_fmts);
}
/* Call this function when we know all parameters.

2
libavcodec/proresdec2.c
View File

@ -278,7 +278,7 @@ static int decode_frame_header(ProresContext *ctx, const uint8_t *buf,
*fmtp++ = ctx->pix_fmt;
*fmtp = AV_PIX_FMT_NONE;
if ((ret = ff_thread_get_format(avctx, pix_fmts)) < 0)
if ((ret = ff_get_format(avctx, pix_fmts)) < 0)
return ret;
avctx->pix_fmt = ret;

2
libavcodec/thread.h
View File

@ -62,8 +62,6 @@ int ff_thread_decode_frame(AVCodecContext *avctx, AVFrame *picture,
*/
void ff_thread_finish_setup(AVCodecContext *avctx);
#define ff_thread_get_format ff_get_format
/**
* Wrapper around get_buffer() for frame-multithreaded codecs.
* Call this function instead of ff_get_buffer(f).

2
libavcodec/vp9.c
View File

@ -250,7 +250,7 @@ static int update_size(AVCodecContext *avctx, int w, int h)
*fmtp++ = s->pix_fmt;
*fmtp = AV_PIX_FMT_NONE;
ret = ff_thread_get_format(avctx, pix_fmts);
ret = ff_get_format(avctx, pix_fmts);
if (ret < 0)
return ret;