diff options
author | wm4 <wm4@nowhere> | 2013-11-29 14:19:29 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-11-29 14:19:29 +0100 |
commit | 60cd30055812d95aba453bdcb9b316e63fda5a31 (patch) | |
tree | fb54dd4a2bf445f7a54966c2e6389d0a2f4a9a5a /video/vaapi.c | |
parent | 0d255f07bf46948289a2698a4a7063514d0e1ef9 (diff) | |
download | mpv-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/vaapi.c')
-rw-r--r-- | video/vaapi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/video/vaapi.c b/video/vaapi.c index fc6a7819e2..4607be9052 100644 --- a/video/vaapi.c +++ b/video/vaapi.c @@ -405,13 +405,13 @@ struct mp_image *va_surface_wrap(struct va_surface *surface) VASurfaceID va_surface_id_in_mp_image(const struct mp_image *mpi) { - return mpi && IMGFMT_IS_VAAPI(mpi->imgfmt) ? + return mpi && mpi->imgfmt == IMGFMT_VAAPI ? (VASurfaceID)(uintptr_t)mpi->planes[3] : VA_INVALID_ID; } struct va_surface *va_surface_in_mp_image(struct mp_image *mpi) { - return mpi && IMGFMT_IS_VAAPI(mpi->imgfmt) ? + return mpi && mpi->imgfmt == IMGFMT_VAAPI ? (struct va_surface*)mpi->planes[0] : NULL; } |