diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2023-03-13 13:41:43 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2023-03-14 07:17:05 +0100 |
| commit | a6e9d01f88a707f8a2057e01b5ad2e8968109530 (patch) | |
| tree | 05d0c4ad69442cf7fb96144f160bfb882392888b /libavcodec/libx264.c | |
| parent | 19e35edaf1f44f19932cdfbc01fec19fc49ed5a2 (diff) | |
| download | ffmpeg-a6e9d01f88a707f8a2057e01b5ad2e8968109530.tar.gz | |
avcodec/libx264: Use av_pix_fmt_count_planes() where appropriate
This also fixes the number of planes for the NV formats
(this seems to not have caused any problems).
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Reviewed-by: Jan Ekström <jeebjp@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec/libx264.c')
| -rw-r--r-- | libavcodec/libx264.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 94006d2b20..92828fabc3 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -189,28 +189,6 @@ static int encode_nals(AVCodecContext *ctx, AVPacket *pkt, return 1; } -static int avfmt2_num_planes(int avfmt) -{ - switch (avfmt) { - case AV_PIX_FMT_YUV420P: - case AV_PIX_FMT_YUVJ420P: - case AV_PIX_FMT_YUV420P9: - case AV_PIX_FMT_YUV420P10: - case AV_PIX_FMT_YUV444P: - return 3; - - case AV_PIX_FMT_BGR0: - case AV_PIX_FMT_BGR24: - case AV_PIX_FMT_RGB24: - case AV_PIX_FMT_GRAY8: - case AV_PIX_FMT_GRAY10: - return 1; - - default: - return 3; - } -} - static void reconfig_encoder(AVCodecContext *ctx, const AVFrame *frame) { X264Context *x4 = ctx->priv_data; @@ -440,7 +418,7 @@ static int setup_frame(AVCodecContext *ctx, const AVFrame *frame, #endif if (bit_depth > 8) pic->img.i_csp |= X264_CSP_HIGH_DEPTH; - pic->img.i_plane = avfmt2_num_planes(ctx->pix_fmt); + pic->img.i_plane = av_pix_fmt_count_planes(ctx->pix_fmt); for (int i = 0; i < pic->img.i_plane; i++) { pic->img.plane[i] = frame->data[i]; |