diff options
Diffstat (limited to 'multimedia/ffmpeg/files')
| -rw-r--r-- | multimedia/ffmpeg/files/patch-configure | 34 | ||||
| -rw-r--r-- | multimedia/ffmpeg/files/patch-libavdevice-bktr.c | 10 | ||||
| -rw-r--r-- | multimedia/ffmpeg/files/patch-libswscale-utils.h | 25 |
3 files changed, 13 insertions, 56 deletions
diff --git a/multimedia/ffmpeg/files/patch-configure b/multimedia/ffmpeg/files/patch-configure index ccf595dadef..5e0f7e987e4 100644 --- a/multimedia/ffmpeg/files/patch-configure +++ b/multimedia/ffmpeg/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2010-06-15 21:44:30.000000000 +0200 -+++ configure 2010-12-12 22:19:20.533163967 +0100 -@@ -1469,7 +1469,7 @@ +--- configure.orig 2011-06-21 21:29:25.000000000 +0200 ++++ configure 2011-06-23 13:36:46.099381871 +0200 +@@ -1657,7 +1657,7 @@ nm_opts='-g' # machine @@ -9,28 +9,10 @@ cpu="generic" # OS -@@ -1514,7 +1514,7 @@ - - CC_O='-o $@' - --host_cflags='-D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -O3 -g -Wall' -+host_cflags='-D_ISOC99_SOURCE -O3 -g -Wall' - host_libs='-lm' - - target_path='$(CURDIR)' -@@ -2096,7 +2096,7 @@ - die "C compiler test failed." - fi - --add_cppflags -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -+add_cppflags -D_ISOC99_SOURCE - check_cflags -std=c99 - check_cc -D_FILE_OFFSET_BITS=64 <<EOF && add_cppflags -D_FILE_OFFSET_BITS=64 - #include <stdlib.h> -@@ -2678,8 +2678,8 @@ - fi - fi +@@ -2966,8 +2966,8 @@ + texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html + check_header linux/fb.h -check_header linux/videodev.h -check_header linux/videodev2.h +#check_header linux/videodev.h @@ -38,10 +20,10 @@ check_header sys/videoio.h check_func_headers "windows.h vfw.h" capCreateCaptureWindow "$vfwcap_indev_extralibs" -@@ -2986,7 +2986,7 @@ +@@ -3322,7 +3322,7 @@ SRC_PATH="$source_path" SRC_PATH_BARE=$source_path - BUILD_ROOT="$PWD" + CC_IDENT=$cc_ident -ARCH=$arch +FFMPEG_ARCH=$arch CC=$cc diff --git a/multimedia/ffmpeg/files/patch-libavdevice-bktr.c b/multimedia/ffmpeg/files/patch-libavdevice-bktr.c index 8ed9552eba7..54177596631 100644 --- a/multimedia/ffmpeg/files/patch-libavdevice-bktr.c +++ b/multimedia/ffmpeg/files/patch-libavdevice-bktr.c @@ -1,5 +1,5 @@ ---- libavdevice/bktr.c.orig 2009-05-15 17:34:55.000000000 +0200 -+++ libavdevice/bktr.c 2009-05-15 17:38:01.000000000 +0200 +--- libavdevice/bktr.c.orig 2011-06-21 21:29:25.000000000 +0200 ++++ libavdevice/bktr.c 2011-06-23 13:39:44.160881669 +0200 @@ -24,6 +24,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -9,6 +9,6 @@ +typedef unsigned int u_int; +typedef unsigned long u_long; + - #define _BSD_SOURCE 1 - #include "libavformat/avformat.h" - #if HAVE_DEV_BKTR_IOCTL_METEOR_H && HAVE_DEV_BKTR_IOCTL_BT848_H + #include "libavutil/log.h" + #include "libavutil/opt.h" + #include "libavutil/parseutils.h" diff --git a/multimedia/ffmpeg/files/patch-libswscale-utils.h b/multimedia/ffmpeg/files/patch-libswscale-utils.h deleted file mode 100644 index f923a3de8bb..00000000000 --- a/multimedia/ffmpeg/files/patch-libswscale-utils.h +++ /dev/null @@ -1,25 +0,0 @@ ---- libswscale/utils.c.orig 2010-12-17 18:58:26.307218801 +0200 -+++ libswscale/utils.c 2010-12-17 19:00:13.409221287 +0200 -@@ -955,8 +955,8 @@ - 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); -@@ -965,7 +965,11 @@ - c->chrMmx2FilterCode = av_malloc(c->chrMmx2FilterCodeSize); - #endif - -+#ifdef MAP_ANONYMOUS -+ if (c->lumMmx2FilterCode == MAP_FAILED || c->chrMmx2FilterCode == MAP_FAILED) -+#else - if (!c->lumMmx2FilterCode || !c->chrMmx2FilterCode) -+#endif - goto fail; - FF_ALLOCZ_OR_GOTO(c, c->hLumFilter , (dstW /8+8)*sizeof(int16_t), fail); - FF_ALLOCZ_OR_GOTO(c, c->hChrFilter , (c->chrDstW /4+8)*sizeof(int16_t), fail); |