Unnecessary since FF_API_THREAD_SAFE_CALLBACKS is no more.
Unified · Split
| @@ -613,7 +613,7 @@ static int get_pixel_format(AVCodecContext *avctx) · 612 unmodified lines | |||
| 613 | *fmtp++ = pix_fmt; | 613 | *fmtp++ = pix_fmt; |
| 614 | *fmtp = AV_PIX_FMT_NONE; | 614 | *fmtp = AV_PIX_FMT_NONE; |
| 615 | 615 | ||
| 616 | ret = ff_thread_get_format(avctx, pix_fmts); | 616 | ret = ff_get_format(avctx, pix_fmts); |
| 617 | 617 | ||
| 618 | /** | 618 | /** |
| 619 | * check if the HW accel is inited correctly. If not, return un-implemented. | 619 | * check if the HW accel is inited correctly. If not, return un-implemented. |
| @@ -922,7 +922,7 @@ static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback) · 921 unmodified lines | |||
| 922 | for (int i = 0; pix_fmts[i] != AV_PIX_FMT_NONE; i++) | 922 | for (int i = 0; pix_fmts[i] != AV_PIX_FMT_NONE; i++) |
| 923 | if (pix_fmts[i] == h->avctx->pix_fmt && !force_callback) | 923 | if (pix_fmts[i] == h->avctx->pix_fmt && !force_callback) |
| 924 | return pix_fmts[i]; | 924 | return pix_fmts[i]; |
| 925 | return ff_thread_get_format(h->avctx, pix_fmts); | 925 | return ff_get_format(h->avctx, pix_fmts); |
| 926 | } | 926 | } |
| 927 | 927 | ||
| 928 | /* export coded and cropped frame dimensions to AVCodecContext */ | 928 | /* export coded and cropped frame dimensions to AVCodecContext */ |
| @@ -521,7 +521,7 @@ static enum AVPixelFormat get_format(HEVCContext *s, const HEVCSPS *sps) · 520 unmodified lines | |||
| 521 | *fmt++ = sps->pix_fmt; | 521 | *fmt++ = sps->pix_fmt; |
| 522 | *fmt = AV_PIX_FMT_NONE; | 522 | *fmt = AV_PIX_FMT_NONE; |
| 523 | 523 | ||
| 524 | return ff_thread_get_format(s->avctx, pix_fmts); | 524 | return ff_get_format(s->avctx, pix_fmts); |
| 525 | } | 525 | } |
| 526 | 526 | ||
| 527 | static int set_sps(HEVCContext *s, const HEVCSPS *sps, | 527 | static int set_sps(HEVCContext *s, const HEVCSPS *sps, |
| @@ -1168,7 +1168,7 @@ static enum AVPixelFormat mpeg_get_pixelformat(AVCodecContext *avctx) · 1167 unmodified lines | |||
| 1168 | else | 1168 | else |
| 1169 | pix_fmts = mpeg12_pixfmt_list_444; | 1169 | pix_fmts = mpeg12_pixfmt_list_444; |
| 1170 | 1170 | ||
| 1171 | return ff_thread_get_format(avctx, pix_fmts); | 1171 | return ff_get_format(avctx, pix_fmts); |
| 1172 | } | 1172 | } |
| 1173 | 1173 | ||
| 1174 | /* Call this function when we know all parameters. | 1174 | /* Call this function when we know all parameters. |
| @@ -278,7 +278,7 @@ static int decode_frame_header(ProresContext *ctx, const uint8_t *buf, · 277 unmodified lines | |||
| 278 | *fmtp++ = ctx->pix_fmt; | 278 | *fmtp++ = ctx->pix_fmt; |
| 279 | *fmtp = AV_PIX_FMT_NONE; | 279 | *fmtp = AV_PIX_FMT_NONE; |
| 280 | 280 | ||
| 281 | if ((ret = ff_thread_get_format(avctx, pix_fmts)) < 0) | 281 | if ((ret = ff_get_format(avctx, pix_fmts)) < 0) |
| 282 | return ret; | 282 | return ret; |
| 283 | 283 | ||
| 284 | avctx->pix_fmt = ret; | 284 | avctx->pix_fmt = ret; |
| @@ -62,8 +62,6 @@ int ff_thread_decode_frame(AVCodecContext *avctx, AVFrame *picture, · 61 unmodified lines | |||
| 62 | */ | 62 | */ |
| 63 | void ff_thread_finish_setup(AVCodecContext *avctx); | 63 | void ff_thread_finish_setup(AVCodecContext *avctx); |
| 64 | 64 | ||
| 65 | #define ff_thread_get_format ff_get_format | ||
| 66 | |||
| 67 | /** | 65 | /** |
| 68 | * Wrapper around get_buffer() for frame-multithreaded codecs. | 66 | * Wrapper around get_buffer() for frame-multithreaded codecs. |
| 69 | * Call this function instead of ff_get_buffer(f). | 67 | * Call this function instead of ff_get_buffer(f). |
| @@ -250,7 +250,7 @@ static int update_size(AVCodecContext *avctx, int w, int h) · 249 unmodified lines | |||
| 250 | *fmtp++ = s->pix_fmt; | 250 | *fmtp++ = s->pix_fmt; |
| 251 | *fmtp = AV_PIX_FMT_NONE; | 251 | *fmtp = AV_PIX_FMT_NONE; |
| 252 | 252 | ||
| 253 | ret = ff_thread_get_format(avctx, pix_fmts); | 253 | ret = ff_get_format(avctx, pix_fmts); |
| 254 | if (ret < 0) | 254 | if (ret < 0) |
| 255 | return ret; | 255 | return ret; |
| 256 | 256 | ||