diff options
author | wm4 <wm4@nowhere> | 2013-09-25 22:44:12 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-09-25 22:44:12 +0200 |
commit | b0cc3c2cf4e342e33300adaea4a98565ad866e22 (patch) | |
tree | 0a6824a49b684461205ecd2881b80a3d42b1bded /video | |
parent | 200fb7eceb5430c0433e09b815fd13a93ded2a8a (diff) | |
download | mpv-b0cc3c2cf4e342e33300adaea4a98565ad866e22.tar.bz2 mpv-b0cc3c2cf4e342e33300adaea4a98565ad866e22.tar.xz |
Fix previous commit
This time it broke because I didn't actually test compiling vo_vaapi.c,
and it was using a macro from mp_image.h, which implicitly assumed
FFALIGN was available. Screw that too, and copy the definition of
ffmpeg's FFALIGN to MP_ALIGN_UP, and move these macros to mp_comnon.h.
Diffstat (limited to 'video')
-rw-r--r-- | video/mp_image.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/video/mp_image.h b/video/mp_image.h index ac981533a0..e198c4e547 100644 --- a/video/mp_image.h +++ b/video/mp_image.h @@ -161,8 +161,4 @@ void mp_image_copy_fields_to_av_frame(struct AVFrame *dst, struct mp_image *mp_image_from_av_frame(struct AVFrame *av_frame); struct AVFrame *mp_image_to_av_frame_and_unref(struct mp_image *img); -// align must be a power of two (align >= 1), v >= 0 -#define MP_ALIGN_UP(v, align) FFALIGN(v, align) -#define MP_ALIGN_DOWN(v, align) ((v) & ~((align) - 1)) - #endif /* MPLAYER_MP_IMAGE_H */ |