diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-14 13:38:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-14 13:48:30 +0100 |
| commit | 41bdef1d39584727c9deaa42b86d085138098231 (patch) | |
| tree | 78afed4ca96612bcd7dad87378c826aecc51f58e /libavcodec/mpegvideo.c | |
| parent | 8ee7b3881bfe96981de28d6eedaf1dcb59fe3215 (diff) | |
| parent | 200e8ac92007bc2fe30da05d3bd00ab620842a6b (diff) | |
Merge commit '200e8ac92007bc2fe30da05d3bd00ab620842a6b'
* commit '200e8ac92007bc2fe30da05d3bd00ab620842a6b':
vdpau: Add MPEG-4 decoding via hwaccel infrastructure
vdpau: Add MPEG-1/2 decoding via hwaccel infrastructure
Conflicts:
configure
libavcodec/Makefile
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 4fd8062a0b..19d30c043a 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -131,6 +131,7 @@ const enum AVPixelFormat ff_hwaccel_pixfmt_list_420[] = { AV_PIX_FMT_DXVA2_VLD, AV_PIX_FMT_VAAPI_VLD, AV_PIX_FMT_VDA_VLD, + AV_PIX_FMT_VDPAU, AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }; |