har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/h263dec: Fixed VA API, VDPAU, and VideoToolbox hardware acceleration due to missing hw_configs property.

Browse Source 
Bug originally introduced in commit 758fbc54fef2f31957b5c5f22e05e5fd9b04f631.
This commit is contained in:
fumoboy007 2019-04-29 14:12:33 -07:00 committed by Carl Eugen Hoyos
parent 60df54ebd2
commit e384f6f2f9
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libavcodec/h263dec.c
View File

@ -743,6 +743,19 @@ const enum AVPixelFormat ff_h263_hwaccel_pixfmt_list_420[] = {
AV_PIX_FMT_NONE AV_PIX_FMT_NONE
}; };
const AVCodecHWConfigInternal *ff_h263_hw_config_list[] = {
#if CONFIG_H263_VAAPI_HWACCEL
HWACCEL_VAAPI(h263),
#endif
#if CONFIG_MPEG4_VDPAU_HWACCEL
HWACCEL_VDPAU(mpeg4),
#endif
#if CONFIG_H263_VIDEOTOOLBOX_HWACCEL
HWACCEL_VIDEOTOOLBOX(h263),
#endif
NULL
};
AVCodec ff_h263_decoder = { AVCodec ff_h263_decoder = {
.name = "h263", .name = "h263",
.long_name = NULL_IF_CONFIG_SMALL("H.263 / H.263-1996, H.263+ / H.263-1998 / H.263 version 2"), .long_name = NULL_IF_CONFIG_SMALL("H.263 / H.263-1996, H.263+ / H.263-1998 / H.263 version 2"),
@ -758,6 +771,7 @@ AVCodec ff_h263_decoder = {
.flush = ff_mpeg_flush, .flush = ff_mpeg_flush,
.max_lowres = 3, .max_lowres = 3,
.pix_fmts = ff_h263_hwaccel_pixfmt_list_420, .pix_fmts = ff_h263_hwaccel_pixfmt_list_420,
.hw_configs = ff_h263_hw_config_list,
}; };
AVCodec ff_h263p_decoder = { AVCodec ff_h263p_decoder = {
@ -775,16 +789,5 @@ AVCodec ff_h263p_decoder = {
.flush = ff_mpeg_flush, .flush = ff_mpeg_flush,
.max_lowres = 3, .max_lowres = 3,
.pix_fmts = ff_h263_hwaccel_pixfmt_list_420, .pix_fmts = ff_h263_hwaccel_pixfmt_list_420,
.hw_configs = (const AVCodecHWConfigInternal*[]) { .hw_configs = ff_h263_hw_config_list,
#if CONFIG_H263_VAAPI_HWACCEL
HWACCEL_VAAPI(h263),
#endif
#if CONFIG_MPEG4_VDPAU_HWACCEL
HWACCEL_VDPAU(mpeg4),
#endif
#if CONFIG_H263_VIDEOTOOLBOX_HWACCEL
HWACCEL_VIDEOTOOLBOX(h263),
#endif
NULL
},
}; };