diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-04-04 20:02:42 +0200 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-04-05 18:23:15 +0200 |
| commit | da53f05fd0a51cd630b1fdf03dec04e5761c8b32 (patch) | |
| tree | 7426cedc91e9ead1da9b30b20bbdb07fb38a97e4 /libavcodec | |
| parent | 735c4f0b8460a943623b7b1a83f55299d8c60523 (diff) | |
| download | ffmpeg-da53f05fd0a51cd630b1fdf03dec04e5761c8b32.tar.gz | |
Do not offer unsupported HWAccel PIX_FMT.
Only fixes MPEG-1/MPEG-2 as a first step.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpeg12.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 4a17299f86..9afe8c3385 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -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[] = { +#if CONFIG_MPEG_XVMC_DECODER PIX_FMT_XVMC_MPEG2_IDCT, PIX_FMT_XVMC_MPEG2_MC, +#endif +#if CONFIG_MPEG1_VDPAU_HWACCEL PIX_FMT_VDPAU_MPEG1, - PIX_FMT_DXVA2_VLD, - PIX_FMT_VAAPI_VLD, +#endif PIX_FMT_YUV420P, PIX_FMT_NONE }; static const enum PixelFormat mpeg2_hwaccel_pixfmt_list_420[] = { +#if CONFIG_MPEG_XVMC_DECODER PIX_FMT_XVMC_MPEG2_IDCT, PIX_FMT_XVMC_MPEG2_MC, +#endif +#if CONFIG_MPEG2_VDPAU_HWACCEL PIX_FMT_VDPAU_MPEG2, +#endif +#if CONFIG_MPEG2_DXVA2_HWACCEL PIX_FMT_DXVA2_VLD, +#endif +#if CONFIG_MPEG2_VAAPI_HWACCEL PIX_FMT_VAAPI_VLD, +#endif PIX_FMT_YUV420P, PIX_FMT_NONE }; |