diff options
| -rw-r--r-- | contrib/ffmpeg/A02-audioconvert.patch | 4 | ||||
| -rw-r--r-- | contrib/ffmpeg/P02-darwin-h264dsp-crash.patch | 14 | ||||
| -rw-r--r-- | contrib/ffmpeg/module.defs | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/contrib/ffmpeg/A02-audioconvert.patch b/contrib/ffmpeg/A02-audioconvert.patch index 5062e3439..bec0cac7c 100644 --- a/contrib/ffmpeg/A02-audioconvert.patch +++ b/contrib/ffmpeg/A02-audioconvert.patch @@ -5,8 +5,8 @@ diff -Naur ffmpeg.orig/libavcodec/Makefile ffmpeg/libavcodec/Makefile NAME = avcodec FFLIBS = avutil --HEADERS = avcodec.h opt.h -+HEADERS = avcodec.h opt.h audioconvert.h +-HEADERS = avcodec.h opt.h vdpau.h xvmc.h ++HEADERS = avcodec.h opt.h vdpau.h xvmc.h audioconvert.h OBJS = allcodecs.o \ audioconvert.o \ diff --git a/contrib/ffmpeg/P02-darwin-h264dsp-crash.patch b/contrib/ffmpeg/P02-darwin-h264dsp-crash.patch index 53b5cf09d..7b5269fd6 100644 --- a/contrib/ffmpeg/P02-darwin-h264dsp-crash.patch +++ b/contrib/ffmpeg/P02-darwin-h264dsp-crash.patch @@ -1,13 +1,13 @@ -Index: ffmpeg/libavcodec/i386/dsputil_mmx.c +Index: ffmpeg/libavcodec/x86/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); +--- ffmpeg/libavcodec/x86/dsputil_mmx.c (revision 14508) ++++ ffmpeg/libavcodec/x86/dsputil_mmx.c (working copy) +@@ -2907,6 +2907,8 @@ + c->vp6_filter_diag4 = ff_vp6_filter_diag4_sse2; + } } +#undef H264_QPEL_FUNCS +#define H264_QPEL_FUNCS(x, y, CPU) - #ifdef HAVE_SSSE3 + #if HAVE_SSSE3 if(mm_flags & MM_SSSE3){ H264_QPEL_FUNCS(1, 0, ssse3); diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs index 04b060910..f045ad5b0 100644 --- a/contrib/ffmpeg/module.defs +++ b/contrib/ffmpeg/module.defs @@ -1,8 +1,8 @@ $(eval $(call import.MODULE.defs,FFMPEG,ffmpeg,FAAD2)) $(eval $(call import.CONTRIB.defs,FFMPEG)) -FFMPEG.FETCH.url = http://download.m0k.org/handbrake/contrib/ffmpeg-r15974.tar.gz -FFMPEG.EXTRACT.tarbase = ffmpeg +FFMPEG.FETCH.url = http://download.m0k.org/handbrake/contrib/ffmpeg_0.5.tar.gz +FFMPEG.EXTRACT.tarbase = ffmpeg-0.5 FFMPEG.CONFIGURE.deps = FFMPEG.CONFIGURE.env = |