diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-09-21 00:23:59 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2023-07-30 21:36:31 +0200 |
| commit | b85557b231782f3bc89746c86512d81f777dab1b (patch) | |
| tree | 543c21f64be1442d7c69e1aafc8329a0d994bfeb | |
| parent | 8bbaecb5de9bac41f7e3a4179ec803ce89ac2d09 (diff) | |
| download | ffmpeg-b85557b231782f3bc89746c86512d81f777dab1b.tar.gz | |
avcodec/h264_slice: Remove always-false check
The H.264 decoder, the only codec with which this code
is ever called, does not set AVCodec.pix_fmts.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | libavcodec/h264_slice.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index e576bcb070..790ba644cd 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -786,8 +786,6 @@ static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback) CONFIG_H264_VDPAU_HWACCEL + \ CONFIG_H264_VULKAN_HWACCEL) enum AVPixelFormat pix_fmts[HWACCEL_MAX + 2], *fmt = pix_fmts; - const enum AVPixelFormat *choices = pix_fmts; - int i; switch (h->ps.sps->bit_depth_luma) { case 9: @@ -888,9 +886,7 @@ static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback) #if CONFIG_H264_VAAPI_HWACCEL *fmt++ = AV_PIX_FMT_VAAPI; #endif - if (h->avctx->codec->pix_fmts) - choices = h->avctx->codec->pix_fmts; - else if (h->avctx->color_range == AVCOL_RANGE_JPEG) + if (h->avctx->color_range == AVCOL_RANGE_JPEG) *fmt++ = AV_PIX_FMT_YUVJ420P; else *fmt++ = AV_PIX_FMT_YUV420P; @@ -904,10 +900,10 @@ static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback) *fmt = AV_PIX_FMT_NONE; - for (i=0; choices[i] != AV_PIX_FMT_NONE; i++) - if (choices[i] == h->avctx->pix_fmt && !force_callback) - return choices[i]; - return ff_thread_get_format(h->avctx, choices); + 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); } /* export coded and cropped frame dimensions to AVCodecContext */ |