summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-09-29 13:52:09 +0200
committerwm4 <wm4@nowhere>2013-09-29 13:52:09 +0200
commit5b3ae5aaac4a223f1d92d56905088d1643414cdb (patch)
treef63fd4e25ae7b4ec1afe139b924c2b889ac79d56 /video
parent60e79262486705e275187580b35921b82dc1d309 (diff)
downloadmpv-5b3ae5aaac4a223f1d92d56905088d1643414cdb.tar.bz2
mpv-5b3ae5aaac4a223f1d92d56905088d1643414cdb.tar.xz
vaapi: remove non-VLD entrypoints
These probably don't work. libavcodec doesn't seem to support them, and neither did the original mplayer-vaapi patch.
Diffstat (limited to 'video')
-rw-r--r--video/decode/vaapi.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/video/decode/vaapi.c b/video/decode/vaapi.c
index 3fba49be12..65c75d1677 100644
--- a/video/decode/vaapi.c
+++ b/video/decode/vaapi.c
@@ -131,8 +131,6 @@ static int find_entrypoint(int format, VAEntrypoint *ep, int num_ep)
int entrypoint = -1;
switch (format) {
case IMGFMT_VAAPI: entrypoint = VAEntrypointVLD; break;
- case IMGFMT_VAAPI_MPEG2_IDCT: entrypoint = VAEntrypointIDCT; break;
- case IMGFMT_VAAPI_MPEG2_MOCO: entrypoint = VAEntrypointMoComp; break;
}
for (int n = 0; n < num_ep; n++) {
if (ep[n] == entrypoint)
@@ -485,8 +483,7 @@ static struct mp_image *copy_image(struct lavc_ctx *ctx, struct mp_image *img)
const struct vd_lavc_hwdec mp_vd_lavc_vaapi = {
.type = HWDEC_VAAPI,
- .image_formats = (const int[]) {IMGFMT_VAAPI, IMGFMT_VAAPI_MPEG2_IDCT,
- IMGFMT_VAAPI_MPEG2_MOCO, 0},
+ .image_formats = (const int[]) {IMGFMT_VAAPI, 0},
.probe = probe,
.init = init,
.uninit = uninit,
@@ -495,8 +492,7 @@ const struct vd_lavc_hwdec mp_vd_lavc_vaapi = {
const struct vd_lavc_hwdec mp_vd_lavc_vaapi_copy = {
.type = HWDEC_VAAPI_COPY,
- .image_formats = (const int[]) {IMGFMT_VAAPI, IMGFMT_VAAPI_MPEG2_IDCT,
- IMGFMT_VAAPI_MPEG2_MOCO, 0},
+ .image_formats = (const int[]) {IMGFMT_VAAPI, 0},
.probe = probe_copy,
.init = init_copy,
.uninit = uninit,