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/allcodecs.c | |
| parent | 8ee7b3881bfe96981de28d6eedaf1dcb59fe3215 (diff) | |
| parent | 200e8ac92007bc2fe30da05d3bd00ab620842a6b (diff) | |
| download | ffmpeg-41bdef1d39584727c9deaa42b86d085138098231.tar.gz | |
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/allcodecs.c')
| -rw-r--r-- | libavcodec/allcodecs.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 619c8e6850..f3431338cc 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -74,6 +74,7 @@ void avcodec_register_all(void) /* hardware accelerators */ REGISTER_HWACCEL(H263_VAAPI, h263_vaapi); + REGISTER_HWACCEL(H263_VDPAU, h263_vdpau); REGISTER_HWACCEL(H264_DXVA2, h264_dxva2); REGISTER_HWACCEL(H264_VAAPI, h264_vaapi); REGISTER_HWACCEL(H264_VDA, h264_vda); @@ -82,6 +83,7 @@ void avcodec_register_all(void) REGISTER_HWACCEL(MPEG2_VAAPI, mpeg2_vaapi); REGISTER_HWACCEL(MPEG2_VDPAU, mpeg2_vdpau); REGISTER_HWACCEL(MPEG4_VAAPI, mpeg4_vaapi); + REGISTER_HWACCEL(MPEG4_VDPAU, mpeg4_vdpau); REGISTER_HWACCEL(VC1_DXVA2, vc1_dxva2); REGISTER_HWACCEL(VC1_VAAPI, vc1_vaapi); REGISTER_HWACCEL(WMV3_DXVA2, wmv3_dxva2); |