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 /libavutil/pixdesc.c | |
| parent | f192f2f061d979e3d2716b9892ca276b5d5cd418 (diff) | |
| parent | dd343fd986459f467a2d1d70c26101dff1d47d68 (diff) | |
| download | ffmpeg-b773a8d8c1dfe4cfc6eabf509e26ab011270b9ed.tar.gz | |
Merge commit 'dd343fd986459f467a2d1d70c26101dff1d47d68'
* commit 'dd343fd986459f467a2d1d70c26101dff1d47d68':
lavu: Drop deprecated VDPAU pixel formats
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavutil/pixdesc.c')
| -rw-r--r-- | libavutil/pixdesc.c | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 81b763b961..3d21e67a78 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -977,44 +977,6 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { }, .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, -#if FF_API_VDPAU - [AV_PIX_FMT_VDPAU_H264] = { - .name = "vdpau_h264", - .log2_chroma_w = 1, - .log2_chroma_h = 1, - .flags = AV_PIX_FMT_FLAG_HWACCEL, - }, - [AV_PIX_FMT_VDPAU_MPEG1] = { - .name = "vdpau_mpeg1", - .log2_chroma_w = 1, - .log2_chroma_h = 1, - .flags = AV_PIX_FMT_FLAG_HWACCEL, - }, - [AV_PIX_FMT_VDPAU_MPEG2] = { - .name = "vdpau_mpeg2", - .log2_chroma_w = 1, - .log2_chroma_h = 1, - .flags = AV_PIX_FMT_FLAG_HWACCEL, - }, - [AV_PIX_FMT_VDPAU_WMV3] = { - .name = "vdpau_wmv3", - .log2_chroma_w = 1, - .log2_chroma_h = 1, - .flags = AV_PIX_FMT_FLAG_HWACCEL, - }, - [AV_PIX_FMT_VDPAU_VC1] = { - .name = "vdpau_vc1", - .log2_chroma_w = 1, - .log2_chroma_h = 1, - .flags = AV_PIX_FMT_FLAG_HWACCEL, - }, - [AV_PIX_FMT_VDPAU_MPEG4] = { - .name = "vdpau_mpeg4", - .log2_chroma_w = 1, - .log2_chroma_h = 1, - .flags = AV_PIX_FMT_FLAG_HWACCEL, - }, -#endif [AV_PIX_FMT_RGB48BE] = { .name = "rgb48be", .nb_components = 3, |