diff options
| author | ritsuka <[email protected]> | 2009-01-01 19:15:25 +0000 |
|---|---|---|
| committer | ritsuka <[email protected]> | 2009-01-01 19:15:25 +0000 |
| commit | ff2720b7225779ef2ce592c0c9fc674c7d6eb76e (patch) | |
| tree | e70e4b4048d13a03d367b3b8364d8b6e40883dd1 | |
| parent | 400acd49ab8e2f76e8f624cf75d37e6099de6ffd (diff) | |
Disable ssse3 h264_qpel optimizations to workaround a crash in h.264 decoder on OS X.
Original patch from the Perian project.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2054 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | contrib/Jamfile | 6 | ||||
| -rw-r--r-- | contrib/patch-ffmpeg-h264dsp-crash.diff | 13 |
2 files changed, 18 insertions, 1 deletions
diff --git a/contrib/Jamfile b/contrib/Jamfile index c24c7602d..09f72955a 100644 --- a/contrib/Jamfile +++ b/contrib/Jamfile @@ -87,7 +87,11 @@ rule LibAvCodec else if $(OS) = SOLARIS { FFMPEG_PATCH += " && $(PATCH) -p1 < ../patch-ffmpeg-solaris.patch " ; - } + } + else if $(OS) = MACOSX + { + FFMPEG_PATCH += " && $(PATCH) -p1 < ../patch-ffmpeg-h264dsp-crash.diff " ; + } if $(OS) = SOLARIS { diff --git a/contrib/patch-ffmpeg-h264dsp-crash.diff b/contrib/patch-ffmpeg-h264dsp-crash.diff new file mode 100644 index 000000000..53b5cf09d --- /dev/null +++ b/contrib/patch-ffmpeg-h264dsp-crash.diff @@ -0,0 +1,13 @@ +Index: ffmpeg/libavcodec/i386/dsputil_mmx.c +=================================================================== +--- ffmpeg/libavcodec/i386/dsputil_mmx.c (revision 14508) ++++ ffmpeg/libavcodec/i386/dsputil_mmx.c (working copy) +@@ -2626,6 +2626,8 @@ + H264_QPEL_FUNCS(3, 2, sse2); + H264_QPEL_FUNCS(3, 3, sse2); + } ++#undef H264_QPEL_FUNCS ++#define H264_QPEL_FUNCS(x, y, CPU) + #ifdef HAVE_SSSE3 + if(mm_flags & MM_SSSE3){ + H264_QPEL_FUNCS(1, 0, ssse3); |