summaryrefslogtreecommitdiffstats
path: root/video/fmt-conversion.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-11-29 14:19:29 +0100
committerwm4 <wm4@nowhere>2013-11-29 14:19:29 +0100
commit60cd30055812d95aba453bdcb9b316e63fda5a31 (patch)
treefb54dd4a2bf445f7a54966c2e6389d0a2f4a9a5a /video/fmt-conversion.c
parent0d255f07bf46948289a2698a4a7063514d0e1ef9 (diff)
downloadmpv-60cd30055812d95aba453bdcb9b316e63fda5a31.tar.bz2
mpv-60cd30055812d95aba453bdcb9b316e63fda5a31.tar.xz
vaapi: remove unused hw image formats, simplify
PIX_FMT_VDA_VLD and PIX_FMT_VAAPI_VLD were never used anywhere. I'm not sure why they were even added, and they sound like they are just for compatibility with XvMC-style decoding, which sucks anyway. Now that there's only a single vaapi format, remove the IMGFMT_IS_VAAPI() macro. Also get rid of IMGFMT_IS_VDA(), which was unused.
Diffstat (limited to 'video/fmt-conversion.c')
-rw-r--r--video/fmt-conversion.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/video/fmt-conversion.c b/video/fmt-conversion.c
index b908837547..371e81c399 100644
--- a/video/fmt-conversion.c
+++ b/video/fmt-conversion.c
@@ -190,11 +190,8 @@ static const struct {
{IMGFMT_VDPAU, PIX_FMT_VDPAU_H264},
#endif
- { IMGFMT_VDA, PIX_FMT_VDA_VLD},
-
- {IMGFMT_VAAPI, PIX_FMT_VAAPI_VLD},
- {IMGFMT_VAAPI_MPEG2_IDCT, PIX_FMT_VAAPI_IDCT},
- {IMGFMT_VAAPI_MPEG2_MOCO, PIX_FMT_VAAPI_MOCO},
+ {IMGFMT_VDA, PIX_FMT_VDA_VLD},
+ {IMGFMT_VAAPI, PIX_FMT_VAAPI_VLD},
{0, PIX_FMT_NONE}
};