| Index: patches/to_upstream/01_static_pthread_O2.patch
|
| ===================================================================
|
| --- patches/to_upstream/01_static_pthread_O2.patch (revision 50820)
|
| +++ patches/to_upstream/01_static_pthread_O2.patch (working copy)
|
| @@ -1,7 +1,7 @@
|
| diff -rpu -N orig/configure ffmpeg-mt/configure
|
| ---- orig/configure 2010-06-17 14:24:32.715784100 -0700
|
| -+++ ffmpeg-mt/configure 2010-06-17 14:24:35.505063000 -0700
|
| -@@ -1724,7 +1724,7 @@ if $cc -v 2>&1 | grep -qi ^gcc; then
|
| +--- orig/configure 2010-06-24 19:18:57.311284200 -0700
|
| ++++ ffmpeg-mt/configure 2010-06-24 19:19:02.022544600 -0700
|
| +@@ -1727,7 +1727,7 @@ if $cc -v 2>&1 | grep -qi ^gcc; then
|
| CC_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@'
|
| AS_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@'
|
| fi
|
| @@ -10,7 +10,7 @@
|
| size_cflags='-Os'
|
| elif $cc --version 2>/dev/null | grep -q Intel; then
|
| cc_type=icc
|
| -@@ -2551,6 +2551,9 @@ if enabled pthreads; then
|
| +@@ -2537,6 +2537,9 @@ if enabled pthreads; then
|
| add_extralibs -pthreads
|
| elif check_func pthread_create -lpthreadGC2; then
|
| add_extralibs -lpthreadGC2
|
| @@ -20,7 +20,7 @@
|
| elif ! check_lib pthread.h pthread_create -lpthread; then
|
| die "ERROR: can't find pthreads library"
|
| fi
|
| -@@ -2754,7 +2757,7 @@ elif enabled ccc; then
|
| +@@ -2748,7 +2751,7 @@ elif enabled ccc; then
|
| elif enabled gcc; then
|
| check_cflags -fno-tree-vectorize
|
| check_cflags -Werror=implicit
|
| @@ -30,8 +30,8 @@
|
| check_cflags -Qunused-arguments
|
| elif enabled armcc; then
|
| diff -rpu -N orig/libavcodec/allcodecs.c ffmpeg-mt/libavcodec/allcodecs.c
|
| ---- orig/libavcodec/allcodecs.c 2010-06-17 14:24:32.839796500 -0700
|
| -+++ ffmpeg-mt/libavcodec/allcodecs.c 2010-06-17 14:24:35.508063300 -0700
|
| +--- orig/libavcodec/allcodecs.c 2010-06-24 19:18:57.451686000 -0700
|
| ++++ ffmpeg-mt/libavcodec/allcodecs.c 2010-06-24 19:19:02.038144800 -0700
|
| @@ -45,6 +45,14 @@
|
| extern AVBitStreamFilter x##_bsf; \
|
| if(CONFIG_##X##_BSF) av_register_bitstream_filter(&x##_bsf); }
|
|
|