Andreas Rheinhardt:
> 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.rheinha...@outlook.com>
> ---
> libavcodec/h264_slice.c | 14 +++++---------
> 1 file changed, 5 insertions(+), 9 deletions(-)
>
> diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
> index 6f0a7c1fb7..58fe245891 100644
> --- a/libavcodec/h264_slice.c
> +++ b/libavcodec/h264_slice.c
> @@ -797,8 +797,6 @@ static enum AVPixelFormat get_pixel_format(H264Context
> *h, int force_callback)
> CONFIG_H264_VIDEOTOOLBOX_HWACCEL + \
> CONFIG_H264_VDPAU_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:
> @@ -883,9 +881,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;
> @@ -899,10 +895,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 */
Forgot about this one. Will apply it tonight unless there are objections.
- Andreas
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
