RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
wm4 2013-09-25 22:44:12 +02:00
parent 200fb7eceb
commit b0cc3c2cf4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mpvcore/mp_common.h
View File

@ -40,6 +40,10 @@
do { type SWAP_tmp = b; b = a; a = SWAP_tmp; } while (0)
#define MP_ARRAY_SIZE(s) (sizeof(s) / sizeof((s)[0]))
// align must be a power of two (align >= 1), x >= 0
#define MP_ALIGN_UP(x, align) (((x) + (align) - 1) & ~((align) - 1))
#define MP_ALIGN_DOWN(x, align) ((x) & ~((align) - 1))
#define CONTROL_OK 1
#define CONTROL_TRUE 1
#define CONTROL_FALSE 0

4
video/mp_image.h
View File

@ -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 */