diff options
author | wm4 <wm4@nowhere> | 2019-09-19 22:26:52 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2019-09-19 23:09:02 +0200 |
commit | 7000d91cf8378ff65594f380e6b089112f5c5c23 (patch) | |
tree | 0868023a25670805b798f827bdc787086799cb67 | |
parent | d75bdf070f2c1043f7eaca83c20db195a5197cb5 (diff) | |
download | mpv-7000d91cf8378ff65594f380e6b089112f5c5c23.tar.bz2 mpv-7000d91cf8378ff65594f380e6b089112f5c5c23.tar.xz |
vf_fingerprint: use aligned_alloc instead of posix_memalign
I was assuming posix_memalign was the most portable function to use, but
MinGW does not provide it for some reason. Switch to C11 aligned_alloc()
which someone suggested was provided by MinGW (but actually isn't,
someone probably confused it with the incompatible _aligned_malloc),
and add a configure check.
Even though it turned out that MinGW doesn't provide it, the function
is slightly more elegant than posix_memalign(), so stay with it.
-rw-r--r-- | video/filter/vf_fingerprint.c | 4 | ||||
-rw-r--r-- | wscript | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/video/filter/vf_fingerprint.c b/video/filter/vf_fingerprint.c index 3fa2ed6770..9f511e168f 100644 --- a/video/filter/vf_fingerprint.c +++ b/video/filter/vf_fingerprint.c @@ -136,8 +136,8 @@ static void reinit_fmt(struct mp_filter *f, struct mp_image *mpi) size_t tmp_size; if (!zimg_filter_graph_get_tmp_size(p->zimg_graph, &tmp_size)) { - if (posix_memalign(&p->zimg_tmp, ZIMG_ALIGN, tmp_size)) - p->zimg_tmp = NULL; + tmp_size = MP_ALIGN_UP(tmp_size, ZIMG_ALIGN); + p->zimg_tmp = aligned_alloc(ZIMG_ALIGN, tmp_size); } if (!p->zimg_tmp) { @@ -214,6 +214,11 @@ main_dependencies = [ 'atomic_int_least64_t test = ATOMIC_VAR_INIT(123);' 'atomic_fetch_add(&test, 1)')) }, { + # C11; technically we still support C99 + 'name': 'aligned_alloc', + 'desc': 'C11 aligned_alloc()', + 'func': check_statement('stdlib.h', 'aligned_alloc(1, 1)'), + }, { 'name': 'atomics', 'desc': 'stdatomic.h support or slow emulation', 'func': check_true, @@ -386,6 +391,7 @@ iconv support use --disable-iconv.", 'func': check_pkg_config('rubberband', '>= 1.8.0'), }, { 'name': '--zimg', + 'deps': 'aligned_alloc', 'desc': 'libzimg support (for vf_fingerprint)', 'func': check_pkg_config('zimg', '>= 2.9'), }, { |