Skip to content

F
ffmpeg.wasm-core
Commit da53f05f authored by Reimar Döffinger's avatar Reimar Döffinger
Browse files
Options

Do not offer unsupported HWAccel PIX_FMT. 

Only fixes MPEG-1/MPEG-2 as a first step.
parent 735c4f0b
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 2 deletions
libavcodec/mpeg12.c
View file @ da53f05f
...@@ -1217,21 +1217,31 @@ static void quant_matrix_rebuild(uint16_t *matrix, const uint8_t *old_perm, ...@@ -1217,21 +1217,31 @@ static void quant_matrix_rebuild(uint16_t *matrix, const uint8_t *old_perm,
} }
static const enum PixelFormat mpeg1_hwaccel_pixfmt_list_420[] = { static const enum PixelFormat mpeg1_hwaccel_pixfmt_list_420[] = {
#if CONFIG_MPEG_XVMC_DECODER
PIX_FMT_XVMC_MPEG2_IDCT, PIX_FMT_XVMC_MPEG2_IDCT,
PIX_FMT_XVMC_MPEG2_MC, PIX_FMT_XVMC_MPEG2_MC,
#endif
#if CONFIG_MPEG1_VDPAU_HWACCEL
PIX_FMT_VDPAU_MPEG1, PIX_FMT_VDPAU_MPEG1,
PIX_FMT_DXVA2_VLD, #endif
PIX_FMT_VAAPI_VLD,
PIX_FMT_YUV420P, PIX_FMT_YUV420P,
PIX_FMT_NONE PIX_FMT_NONE
}; };
static const enum PixelFormat mpeg2_hwaccel_pixfmt_list_420[] = { static const enum PixelFormat mpeg2_hwaccel_pixfmt_list_420[] = {
#if CONFIG_MPEG_XVMC_DECODER
PIX_FMT_XVMC_MPEG2_IDCT, PIX_FMT_XVMC_MPEG2_IDCT,
PIX_FMT_XVMC_MPEG2_MC, PIX_FMT_XVMC_MPEG2_MC,
#endif
#if CONFIG_MPEG2_VDPAU_HWACCEL
PIX_FMT_VDPAU_MPEG2, PIX_FMT_VDPAU_MPEG2,
#endif
#if CONFIG_MPEG2_DXVA2_HWACCEL
PIX_FMT_DXVA2_VLD, PIX_FMT_DXVA2_VLD,
#endif
#if CONFIG_MPEG2_VAAPI_HWACCEL
PIX_FMT_VAAPI_VLD, PIX_FMT_VAAPI_VLD,
#endif
PIX_FMT_YUV420P, PIX_FMT_YUV420P,
PIX_FMT_NONE PIX_FMT_NONE
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment