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/vdpau.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/vdpau.c')
| -rw-r--r-- | libavcodec/vdpau.c | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c index 20ce97b5fe..7bf693a90c 100644 --- a/libavcodec/vdpau.c +++ b/libavcodec/vdpau.c @@ -419,40 +419,4 @@ void ff_vdpau_mpeg4_decode_picture(MpegEncContext *s, const uint8_t *buf, render->bitstream_buffers_used = 0; } -// Only dummy functions for now -static int vdpau_mpeg2_start_frame(AVCodecContext *avctx, const uint8_t *buffer, uint32_t size) -{ - return 0; -} - -static int vdpau_mpeg2_decode_slice(AVCodecContext *avctx, const uint8_t *buffer, uint32_t size) -{ - return 0; -} - -static int vdpau_mpeg2_end_frame(AVCodecContext *avctx) -{ - return 0; -} - -AVHWAccel ff_mpeg1_vdpau_hwaccel = { - .name = "mpeg1_vdpau", - .type = AVMEDIA_TYPE_VIDEO, - .id = AV_CODEC_ID_MPEG1VIDEO, - .pix_fmt = AV_PIX_FMT_VDPAU_MPEG1, - .start_frame = vdpau_mpeg2_start_frame, - .end_frame = vdpau_mpeg2_end_frame, - .decode_slice = vdpau_mpeg2_decode_slice, -}; - -AVHWAccel ff_mpeg2_vdpau_hwaccel = { - .name = "mpeg2_vdpau", - .type = AVMEDIA_TYPE_VIDEO, - .id = AV_CODEC_ID_MPEG2VIDEO, - .pix_fmt = AV_PIX_FMT_VDPAU_MPEG2, - .start_frame = vdpau_mpeg2_start_frame, - .end_frame = vdpau_mpeg2_end_frame, - .decode_slice = vdpau_mpeg2_decode_slice, -}; - /* @}*/ |