summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-09-25 22:22:02 +0200
committerwm4 <wm4@nowhere>2013-09-25 22:22:02 +0200
commit200fb7eceb5430c0433e09b815fd13a93ded2a8a (patch)
tree53e513fd74e9266d559ecd768cd98b1eda19e91f /video
parent72fbd846db3bf446b3fa00eba4f0197e6214f942 (diff)
downloadmpv-200fb7eceb5430c0433e09b815fd13a93ded2a8a.tar.bz2
mpv-200fb7eceb5430c0433e09b815fd13a93ded2a8a.tar.xz
vaapi: fix compilation with Libav
The code using FFSWAP was moved from vo_vaapi.c to vaapi.c, which didn't include libavutil/common.h anymore, just libavutil/avutil.h. The header avutil.h doesn't include common.h recursively in Libav, so it broke there. Add FFSWAP as MPSWAP in mp_common.h (copy pasted from ffmpeg) to make sure this doesn't happen again. (This kind of stuff happens all too often, so screw libavutil.)
Diffstat (limited to 'video')
-rw-r--r--video/out/vo_vaapi.c3
-rw-r--r--video/vaapi.c6
2 files changed, 3 insertions, 6 deletions
diff --git a/video/out/vo_vaapi.c b/video/out/vo_vaapi.c
index dd7f138a24..68fb09ff9b 100644
--- a/video/out/vo_vaapi.c
+++ b/video/out/vo_vaapi.c
@@ -27,9 +27,6 @@
#include <X11/Xutil.h>
#include <va/va_x11.h>
-#include <libavutil/common.h>
-#include <libavcodec/vaapi.h>
-
#include "config.h"
#include "mpvcore/mp_msg.h"
#include "video/out/vo.h"
diff --git a/video/vaapi.c b/video/vaapi.c
index 3612ec2a9a..70ab691323 100644
--- a/video/vaapi.c
+++ b/video/vaapi.c
@@ -16,9 +16,9 @@
*/
#include <assert.h>
-#include <libavutil/avutil.h>
#include "vaapi.h"
+#include "mpvcore/mp_common.h"
#include "mpvcore/mp_msg.h"
#include "mp_image.h"
#include "img_format.h"
@@ -439,8 +439,8 @@ bool va_image_map(VADisplay display, VAImage *image, struct mp_image *mpi)
}
if (image->format.fourcc == VA_FOURCC_YV12) {
- FFSWAP(unsigned int, mpi->stride[1], mpi->stride[2]);
- FFSWAP(uint8_t *, mpi->planes[1], mpi->planes[2]);
+ MPSWAP(unsigned int, mpi->stride[1], mpi->stride[2]);
+ MPSWAP(uint8_t *, mpi->planes[1], mpi->planes[2]);
}
return true;