@ -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 ; choice s[ i ] ! = AV_PIX_FMT_NONE ; i + + )
if ( choice s[ i ] = = h - > avctx - > pix_fmt & & ! force_callback )
return choice s[ i ] ;
return ff_thread_get_format ( h - > avctx , choice s) ;
for ( int i = 0 ; pix_fmt s[ i ] ! = AV_PIX_FMT_NONE ; i + + )
if ( pix_fmt s[ i ] = = h - > avctx - > pix_fmt & & ! force_callback )
return pix_fmt s[ i ] ;
return ff_thread_get_format ( h - > avctx , pix_fmt s) ;
}
/* export coded and cropped frame dimensions to AVCodecContext */