summaryrefslogtreecommitdiffstats
path: root/contrib/ffmpeg/P02-darwin-pic.patch
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2014-01-12 21:48:54 +0000
committerjstebbins <[email protected]>2014-01-12 21:48:54 +0000
commitd69e6b4612a40ba2a4714ac8e02a9b4fea6bb03c (patch)
treed51d1d3b5f01a2ea27b97c2eed8ddc26865ec333 /contrib/ffmpeg/P02-darwin-pic.patch
parenta42fd932a3fdc837bd7d7c8d83f7f0a335f18ce7 (diff)
bump libav, libav-v10_alpha1-90-g63debaa
Adds interlaced VC1 and HEVC support. Eliminates the need for most of our local patches. Many assorted bug fixes and improvements. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5962 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/ffmpeg/P02-darwin-pic.patch')
-rw-r--r--contrib/ffmpeg/P02-darwin-pic.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/contrib/ffmpeg/P02-darwin-pic.patch b/contrib/ffmpeg/P02-darwin-pic.patch
index f512416a1..fc43504bc 100644
--- a/contrib/ffmpeg/P02-darwin-pic.patch
+++ b/contrib/ffmpeg/P02-darwin-pic.patch
@@ -1,21 +1,21 @@
diff --git a/configure b/configure
-index 6ab04ae..fa9f980 100755
+index e9fc08c..72bff03 100755
--- a/configure
+++ b/configure
-@@ -2893,6 +2893,7 @@ case $target_os in
- AVSERVERLDFLAGS=-Wl,-bind_at_load
+@@ -3263,6 +3263,7 @@ case $target_os in
+ SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME).$(LIBMAJOR)$(SLIBSUF)'
objformat="macho"
enabled x86_64 && objformat="macho64"
+ enabled x86_64 && enable pic
enabled_any pic shared ||
{ check_cflags -mdynamic-no-pic && add_asflags -mdynamic-no-pic; }
;;
-@@ -3095,7 +3096,7 @@ esc(){
+@@ -3502,7 +3503,7 @@ esc(){
echo "config:$arch:$subarch:$cpu:$target_os:$(esc $cc_ident):$(esc $LIBAV_CONFIGURATION)" >config.fate
--check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable pic
-+#check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable pic
+-check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable_weak pic
++#check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable_weak pic
set_default $PATHS_LIST
set_default nm