diff options
| author | jstebbins <[email protected]> | 2010-04-25 21:15:43 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2010-04-25 21:15:43 +0000 |
| commit | c22e82ad0081856466a92a6e47a72b3ea9b5628c (patch) | |
| tree | 4118bfdb4913105820b98e7317021704c8f39faa /contrib/ffmpeg/P02-darwin-pic.patch | |
| parent | e6ba7dc071b0b1f070b7f92e3b30eab1ee00a0b5 (diff) | |
bump ffmpeg to rev 22950
offset ffmpeg seeks by value of initial timestamp since it can be non-zero
catch pix fmt that is unsupported by swscale, log it, skip the track
use new ffmpeg avg_frame_rate for more accurate framerate estimate
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3267 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/ffmpeg/P02-darwin-pic.patch')
| -rw-r--r-- | contrib/ffmpeg/P02-darwin-pic.patch | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/contrib/ffmpeg/P02-darwin-pic.patch b/contrib/ffmpeg/P02-darwin-pic.patch index 3368da8be..c151b2950 100644 --- a/contrib/ffmpeg/P02-darwin-pic.patch +++ b/contrib/ffmpeg/P02-darwin-pic.patch @@ -1,16 +1,8 @@ -diff -Naur ffmpeg-r20602.orig/configure ffmpeg-r20602/configure ---- ffmpeg-r20602.orig/configure 2009-11-24 15:17:19.000000000 -0800 -+++ ffmpeg-r20602/configure 2009-11-27 12:02:03.659012744 -0800 -@@ -1913,7 +1913,7 @@ - - enable $arch $subarch - enabled spic && 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 pic - - # OS specific - case $target_os in -@@ -1982,6 +1982,7 @@ +Index: configure +=================================================================== +--- ffmpeg.orig/configure (revision 22823) ++++ ffmpeg/configure (working copy) +@@ -2191,6 +2191,7 @@ FFSERVERLDFLAGS=-Wl,-bind_at_load objformat="macho" enabled x86_64 && objformat="macho64" @@ -18,3 +10,12 @@ diff -Naur ffmpeg-r20602.orig/configure ffmpeg-r20602/configure enabled_any pic shared || { check_cflags -mdynamic-no-pic && add_asflags -mdynamic-no-pic; } ;; +@@ -2291,7 +2292,7 @@ + ;; + esac + +-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 + + set_default $PATHS_LIST + |