Skip to content

F
ffmpeg
Commit 2d8dddd9 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

Merge branch 'vdpau' of https://github.com/FernetMenta/FFmpeg 

Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents fb90e7b8 fe1f3654
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
libavcodec/mpeg12dec.c
View file @ 2d8dddd9
...@@ -1098,6 +1098,7 @@ static const enum AVPixelFormat mpeg1_hwaccel_pixfmt_list_420[] = { ...@@ -1098,6 +1098,7 @@ static const enum AVPixelFormat mpeg1_hwaccel_pixfmt_list_420[] = {
#endif #endif
#if CONFIG_MPEG1_VDPAU_HWACCEL #if CONFIG_MPEG1_VDPAU_HWACCEL
AV_PIX_FMT_VDPAU_MPEG1, AV_PIX_FMT_VDPAU_MPEG1,
AV_PIX_FMT_VDPAU,
#endif #endif
AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV420P,
AV_PIX_FMT_NONE AV_PIX_FMT_NONE
...@@ -1110,6 +1111,7 @@ static const enum AVPixelFormat mpeg2_hwaccel_pixfmt_list_420[] = { ...@@ -1110,6 +1111,7 @@ static const enum AVPixelFormat mpeg2_hwaccel_pixfmt_list_420[] = {
#endif #endif
#if CONFIG_MPEG2_VDPAU_HWACCEL #if CONFIG_MPEG2_VDPAU_HWACCEL
AV_PIX_FMT_VDPAU_MPEG2, AV_PIX_FMT_VDPAU_MPEG2,
AV_PIX_FMT_VDPAU,
#endif #endif
#if CONFIG_MPEG2_DXVA2_HWACCEL #if CONFIG_MPEG2_DXVA2_HWACCEL
AV_PIX_FMT_DXVA2_VLD, AV_PIX_FMT_DXVA2_VLD,
......
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