[SCM] libav/experimental: fix anonymous memory mapping for NetBSD

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:14:17 UTC 2013


The following commit has been merged in the experimental branch:
commit 53bc0dc2bdc1566156331ebe1c1d7bf0e0879c1f
Author: Grant Carver <grantc at cat.co.za>
Date:   Thu Aug 19 23:48:19 2010 +0000

    fix anonymous memory mapping for NetBSD
    
    mmap() with MAP_ANONYMOUS requires the file descriptor to be -1 in NetBSD.
    Linux just ignores this parameter.
    
    Patch by Grant Carver <grantc at cat dot co dot za>
    
    Originally committed as revision 31984 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

diff --git a/libswscale/utils.c b/libswscale/utils.c
index 9d2a468..35e1126 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -897,8 +897,8 @@ SwsContext *sws_getContext(int srcW, int srcH, enum PixelFormat srcFormat,
             c->chrMmx2FilterCodeSize = initMMX2HScaler(c->chrDstW, c->chrXInc, NULL, NULL, NULL, 4);
 
 #ifdef MAP_ANONYMOUS
-            c->lumMmx2FilterCode = mmap(NULL, c->lumMmx2FilterCodeSize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
-            c->chrMmx2FilterCode = mmap(NULL, c->chrMmx2FilterCodeSize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
+            c->lumMmx2FilterCode = mmap(NULL, c->lumMmx2FilterCodeSize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+            c->chrMmx2FilterCode = mmap(NULL, c->chrMmx2FilterCodeSize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 #elif HAVE_VIRTUALALLOC
             c->lumMmx2FilterCode = VirtualAlloc(NULL, c->lumMmx2FilterCodeSize, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
             c->chrMmx2FilterCode = VirtualAlloc(NULL, c->chrMmx2FilterCodeSize, MEM_COMMIT, PAGE_EXECUTE_READWRITE);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list