diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-23 18:15:49 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-23 18:15:49 -0300 |
| commit | b773a8d8c1dfe4cfc6eabf509e26ab011270b9ed (patch) | |
| tree | 5055beedccbbf7f81f523598117a09755dc6b083 /libavcodec/h264dec.c | |
| parent | f192f2f061d979e3d2716b9892ca276b5d5cd418 (diff) | |
| parent | dd343fd986459f467a2d1d70c26101dff1d47d68 (diff) | |
Merge commit 'dd343fd986459f467a2d1d70c26101dff1d47d68'
* commit 'dd343fd986459f467a2d1d70c26101dff1d47d68':
lavu: Drop deprecated VDPAU pixel formats
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/h264dec.c')
| -rw-r--r-- | libavcodec/h264dec.c | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 5abaaabf9d..4216b66684 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -50,10 +50,10 @@ #include "mathops.h" #include "me_cmp.h" #include "mpegutils.h" +#include "mpeg4video.h" #include "profiles.h" #include "rectangle.h" #include "thread.h" -#include "vdpau_compat.h" const uint16_t ff_h264_mb_sizes[4] = { 256, 384, 512, 768 }; @@ -1049,29 +1049,3 @@ AVCodec ff_h264_decoder = { .profiles = NULL_IF_CONFIG_SMALL(ff_h264_profiles), .priv_class = &h264_class, }; - -#if CONFIG_H264_VDPAU_DECODER && FF_API_VDPAU -static const AVClass h264_vdpau_class = { - .class_name = "H264 VDPAU Decoder", - .item_name = av_default_item_name, - .option = h264_options, - .version = LIBAVUTIL_VERSION_INT, -}; - -AVCodec ff_h264_vdpau_decoder = { - .name = "h264_vdpau", - .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10 (VDPAU acceleration)"), - .type = AVMEDIA_TYPE_VIDEO, - .id = AV_CODEC_ID_H264, - .priv_data_size = sizeof(H264Context), - .init = h264_decode_init, - .close = h264_decode_end, - .decode = h264_decode_frame, - .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HWACCEL_VDPAU, - .flush = flush_dpb, - .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_VDPAU_H264, - AV_PIX_FMT_NONE}, - .profiles = NULL_IF_CONFIG_SMALL(ff_h264_profiles), - .priv_class = &h264_vdpau_class, -}; -#endif |