From da05689b96c6fac6079698628b6005eaa08bb4ab Mon Sep 17 00:00:00 2001 From: Jay Freeman Date: Wed, 28 May 2008 09:39:25 +0000 Subject: Merged to the latest ffmpeg and added some stuff. git-svn-id: http://svn.telesphoreo.org/trunk@291 514c082c-b64e-11dc-b46d-3d985efe055d --- data/ffmpeg_/_metadata/version | 2 +- data/ffmpeg_/armv5.diff | 12 +++++++ data/ffmpeg_/ffmpeg-export-snapshot.tar.bz2 | Bin 2489873 -> 2538134 bytes data/ffmpeg_/make.sh | 6 ++-- data/ffmpeg_/r7.diff | 48 ++++++++++++++++++++++++++++ 5 files changed, 65 insertions(+), 3 deletions(-) create mode 100644 data/ffmpeg_/armv5.diff create mode 100644 data/ffmpeg_/r7.diff (limited to 'data/ffmpeg_') diff --git a/data/ffmpeg_/_metadata/version b/data/ffmpeg_/_metadata/version index c343caa8e..e6e945aa5 100644 --- a/data/ffmpeg_/_metadata/version +++ b/data/ffmpeg_/_metadata/version @@ -1 +1 @@ -12223 +13202 diff --git a/data/ffmpeg_/armv5.diff b/data/ffmpeg_/armv5.diff new file mode 100644 index 000000000..87895ba33 --- /dev/null +++ b/data/ffmpeg_/armv5.diff @@ -0,0 +1,12 @@ +diff -ru ffmpeg-export-2008-05-20/libavcodec/armv4l/mpegvideo_armv5te.c ffmpeg-export-2008-05-20+iPhone/libavcodec/armv4l/mpegvideo_armv5te.c +--- ffmpeg-export-2008-05-20/libavcodec/armv4l/mpegvideo_armv5te.c 2008-05-09 11:56:36.000000000 +0000 ++++ ffmpeg-export-2008-05-20+iPhone/libavcodec/armv4l/mpegvideo_armv5te.c 2008-05-21 08:43:52.000000000 +0000 +@@ -201,7 +201,7 @@ + void MPV_common_init_armv5te(MpegEncContext *s) + { + #ifdef HAVE_DCT_UNQUANTIZE_H263_ARMV5TE_OPTIMIZED +- s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_armv5te; ++ //s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_armv5te; + s->dct_unquantize_h263_inter = dct_unquantize_h263_inter_armv5te; + #endif + } diff --git a/data/ffmpeg_/ffmpeg-export-snapshot.tar.bz2 b/data/ffmpeg_/ffmpeg-export-snapshot.tar.bz2 index 6f97a0f25..56cf50555 100644 Binary files a/data/ffmpeg_/ffmpeg-export-snapshot.tar.bz2 and b/data/ffmpeg_/ffmpeg-export-snapshot.tar.bz2 differ diff --git a/data/ffmpeg_/make.sh b/data/ffmpeg_/make.sh index 8fff96236..cc9d0670f 100644 --- a/data/ffmpeg_/make.sh +++ b/data/ffmpeg_/make.sh @@ -1,8 +1,10 @@ pkg:setup ./configure \ - --cross-compile --cross-prefix=${PKG_TARG}- --target-os=darwin \ + --prefix=/usr --enable-gpl --enable-postproc --enable-swscale \ + --disable-vhook --enable-avfilter --enable-avfilter-lavf \ + --enable-cross-compile --cross-prefix=${PKG_TARG}- --target-os=darwin \ --arch=arm --disable-iwmmxt --enable-armv5te --enable-armv6 \ - --enable-static --disable-shared --disable-debug --prefix=/usr --enable-gpl \ + --enable-static --disable-shared --disable-debug --disable-stripping \ --enable-libfaac \ --enable-libfaad \ --enable-libmp3lame \ diff --git a/data/ffmpeg_/r7.diff b/data/ffmpeg_/r7.diff new file mode 100644 index 000000000..3b1af70fb --- /dev/null +++ b/data/ffmpeg_/r7.diff @@ -0,0 +1,48 @@ +diff -ru ffmpeg-export-2008-05-20/libavcodec/armv4l/float_arm_vfp.c ffmpeg-export-2008-05-20+iPhone/libavcodec/armv4l/float_arm_vfp.c +--- ffmpeg-export-2008-05-20/libavcodec/armv4l/float_arm_vfp.c 2008-05-11 20:06:03.000000000 +0000 ++++ ffmpeg-export-2008-05-20+iPhone/libavcodec/armv4l/float_arm_vfp.c 2008-05-21 00:44:04.000000000 +0000 +@@ -141,6 +141,13 @@ + } + + #ifdef HAVE_ARMV6 ++ ++#ifdef __APPLE__ ++#define r7 "r9" ++#else ++#define r7 "r7" ++#endif ++ + /** + * ARM VFP optimized float to int16 conversion. + * Assume that len is a positive number and is multiple of 8, destination +@@ -163,7 +170,7 @@ + "subs %[len], %[len], #8\n\t" + "fmrrs r3, r4, {s0, s1}\n\t" + "fmrrs r5, r6, {s2, s3}\n\t" +- "fmrrs r7, r8, {s4, s5}\n\t" ++ "fmrrs "r7", r8, {s4, s5}\n\t" + "fmrrs ip, lr, {s6, s7}\n\t" + "fldmiasgt %[src]!, {s16-s23}\n\t" + "ssat r4, #16, r4\n\t" +@@ -181,10 +188,10 @@ + "ftosisgt s6, s22\n\t" + "ftosisgt s7, s23\n\t" + "ssat r8, #16, r8\n\t" +- "ssat r7, #16, r7\n\t" ++ "ssat "r7", #16, "r7"\n\t" + "ssat lr, #16, lr\n\t" + "ssat ip, #16, ip\n\t" +- "pkhbt r5, r7, r8, lsl #16\n\t" ++ "pkhbt r5, "r7", r8, lsl #16\n\t" + "pkhbt r6, ip, lr, lsl #16\n\t" + "stmia %[dst]!, {r3-r6}\n\t" + "bgt 1b\n\t" +@@ -193,7 +200,7 @@ + : + : "s0", "s1", "s2", "s3", "s4", "s5", "s6", "s7", + "s16", "s17", "s18", "s19", "s20", "s21", "s22", "s23", +- "r3", "r4", "r5", "r6", "r7", "r8", "ip", "lr", ++ "r3", "r4", "r5", "r6", r7, "r8", "ip", "lr", + "cc", "memory"); + } + #endif -- cgit v1.2.3