summaryrefslogtreecommitdiff
path: root/data/ffmpeg_
diff options
context:
space:
mode:
Diffstat (limited to 'data/ffmpeg_')
-rw-r--r--data/ffmpeg_/armv5.diff12
-rw-r--r--data/ffmpeg_/assembler.diff538
-rw-r--r--data/ffmpeg_/ffmpeg-4.0.2.tar.gzbin0 -> 13004482 bytes
-rw-r--r--data/ffmpeg_/ffmpeg-export-snapshot.tar.bz2bin2538134 -> 0 bytes
-rw-r--r--data/ffmpeg_/make.sh11
-rw-r--r--data/ffmpeg_/mjpega.diff32
-rw-r--r--data/ffmpeg_/r7.diff48
-rw-r--r--data/ffmpeg_/timestamp.diff11
-rw-r--r--data/ffmpeg_/version.diff12
9 files changed, 5 insertions, 659 deletions
diff --git a/data/ffmpeg_/armv5.diff b/data/ffmpeg_/armv5.diff
deleted file mode 100644
index 87895ba33..000000000
--- a/data/ffmpeg_/armv5.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-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_/assembler.diff b/data/ffmpeg_/assembler.diff
deleted file mode 100644
index 83e63a837..000000000
--- a/data/ffmpeg_/assembler.diff
+++ /dev/null
@@ -1,538 +0,0 @@
-diff -ru ffmpeg-export-2008-02-26/libavcodec/armv4l/dsputil_arm_s.S ffmpeg-export-2008-02-26+iPhone/libavcodec/armv4l/dsputil_arm_s.S
---- ffmpeg-export-2008-02-26/libavcodec/armv4l/dsputil_arm_s.S 2007-09-05 11:05:33.000000000 +0000
-+++ ffmpeg-export-2008-02-26+iPhone/libavcodec/armv4l/dsputil_arm_s.S 2008-05-20 09:05:01.000000000 +0000
-@@ -72,8 +72,8 @@
-
- @ ----------------------------------------------------------------
- .align 8
-- .global put_pixels16_arm
--put_pixels16_arm:
-+ .global _put_pixels16_arm
-+_put_pixels16_arm:
- @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h)
- @ block = word aligned, pixles = unaligned
- pld [r1]
-@@ -134,8 +134,8 @@
-
- @ ----------------------------------------------------------------
- .align 8
-- .global put_pixels8_arm
--put_pixels8_arm:
-+ .global _put_pixels8_arm
-+_put_pixels8_arm:
- @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h)
- @ block = word aligned, pixles = unaligned
- pld [r1]
-@@ -196,8 +196,8 @@
-
- @ ----------------------------------------------------------------
- .align 8
-- .global put_pixels8_x2_arm
--put_pixels8_x2_arm:
-+ .global _put_pixels8_x2_arm
-+_put_pixels8_x2_arm:
- @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h)
- @ block = word aligned, pixles = unaligned
- pld [r1]
-@@ -265,8 +265,8 @@
- .word 4b
-
- .align 8
-- .global put_no_rnd_pixels8_x2_arm
--put_no_rnd_pixels8_x2_arm:
-+ .global _put_no_rnd_pixels8_x2_arm
-+_put_no_rnd_pixels8_x2_arm:
- @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h)
- @ block = word aligned, pixles = unaligned
- pld [r1]
-@@ -336,8 +336,8 @@
-
- @ ----------------------------------------------------------------
- .align 8
-- .global put_pixels8_y2_arm
--put_pixels8_y2_arm:
-+ .global _put_pixels8_y2_arm
-+_put_pixels8_y2_arm:
- @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h)
- @ block = word aligned, pixles = unaligned
- pld [r1]
-@@ -445,8 +445,8 @@
- .word 4b
-
- .align 8
-- .global put_no_rnd_pixels8_y2_arm
--put_no_rnd_pixels8_y2_arm:
-+ .global _put_no_rnd_pixels8_y2_arm
-+_put_no_rnd_pixels8_y2_arm:
- @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h)
- @ block = word aligned, pixles = unaligned
- pld [r1]
-@@ -618,8 +618,8 @@
- .endm
-
- .align 8
-- .global put_pixels8_xy2_arm
--put_pixels8_xy2_arm:
-+ .global _put_pixels8_xy2_arm
-+_put_pixels8_xy2_arm:
- @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h)
- @ block = word aligned, pixles = unaligned
- pld [r1]
-@@ -654,8 +654,8 @@
- .word 0x0F0F0F0F
-
- .align 8
-- .global put_no_rnd_pixels8_xy2_arm
--put_no_rnd_pixels8_xy2_arm:
-+ .global _put_no_rnd_pixels8_xy2_arm
-+_put_no_rnd_pixels8_xy2_arm:
- @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h)
- @ block = word aligned, pixles = unaligned
- pld [r1]
-diff -ru ffmpeg-export-2008-02-26/libavcodec/armv4l/jrevdct_arm.S ffmpeg-export-2008-02-26+iPhone/libavcodec/armv4l/jrevdct_arm.S
---- ffmpeg-export-2008-02-26/libavcodec/armv4l/jrevdct_arm.S 2005-12-22 01:10:11.000000000 +0000
-+++ ffmpeg-export-2008-02-26+iPhone/libavcodec/armv4l/jrevdct_arm.S 2008-05-20 09:03:43.000000000 +0000
-@@ -54,8 +54,8 @@
- .text
- .align
-
-- .global j_rev_dct_ARM
--j_rev_dct_ARM:
-+ .global _j_rev_dct_ARM
-+_j_rev_dct_ARM:
- stmdb sp!, { r4 - r12, lr } @ all callee saved regs
-
- sub sp, sp, #4 @ reserve some space on the stack
-diff -ru ffmpeg-export-2008-02-26/libavcodec/armv4l/simple_idct_arm.S ffmpeg-export-2008-02-26+iPhone/libavcodec/armv4l/simple_idct_arm.S
---- ffmpeg-export-2008-02-26/libavcodec/armv4l/simple_idct_arm.S 2007-12-02 15:43:08.000000000 +0000
-+++ ffmpeg-export-2008-02-26+iPhone/libavcodec/armv4l/simple_idct_arm.S 2008-05-20 09:03:13.000000000 +0000
-@@ -54,9 +54,9 @@
-
- .text
- .align
-- .global simple_idct_ARM
-+ .global _simple_idct_ARM
-
--simple_idct_ARM:
-+_simple_idct_ARM:
- @@ void simple_idct_ARM(int16_t *block)
- @@ save stack for reg needed (take all of them),
- @@ R0-R3 are scratch regs, so no need to save them, but R0 contains the pointer to block
-diff -ru ffmpeg-export-2008-02-26/libavcodec/armv4l/simple_idct_armv5te.S ffmpeg-export-2008-02-26+iPhone/libavcodec/armv4l/simple_idct_armv5te.S
---- ffmpeg-export-2008-02-26/libavcodec/armv4l/simple_idct_armv5te.S 2007-07-05 20:08:51.000000000 +0000
-+++ ffmpeg-export-2008-02-26+iPhone/libavcodec/armv4l/simple_idct_armv5te.S 2008-05-20 09:02:30.000000000 +0000
-@@ -42,9 +42,9 @@
- w57: .long W57
-
- .align
-- .type idct_row_armv5te, %function
-- .func idct_row_armv5te
--idct_row_armv5te:
-+ @.type idct_row_armv5te, %function
-+ @.func idct_row_armv5te
-+_idct_row_armv5te:
- str lr, [sp, #-4]!
-
- ldrd v1, [a1, #8]
-@@ -148,7 +148,7 @@
- strd a3, [a1, #8]
-
- ldr pc, [sp], #4
-- .endfunc
-+ @.endfunc
-
- .macro idct_col
- ldr a4, [a1] /* a4 = col[1:0] */
-@@ -263,9 +263,9 @@
- .endm
-
- .align
-- .type idct_col_armv5te, %function
-- .func idct_col_armv5te
--idct_col_armv5te:
-+ @.type idct_col_armv5te, %function
-+ @.func idct_col_armv5te
-+_idct_col_armv5te:
- str lr, [sp, #-4]!
-
- idct_col
-@@ -335,12 +335,12 @@
- str a2, [a1, #(16*4)]
-
- ldr pc, [sp], #4
-- .endfunc
-+ @.endfunc
-
- .align
-- .type idct_col_put_armv5te, %function
-- .func idct_col_put_armv5te
--idct_col_put_armv5te:
-+ @.type idct_col_put_armv5te, %function
-+ @.func idct_col_put_armv5te
-+_idct_col_put_armv5te:
- str lr, [sp, #-4]!
-
- idct_col
-@@ -455,12 +455,12 @@
- strh a2, [v2, -lr]
-
- ldr pc, [sp], #4
-- .endfunc
-+ @.endfunc
-
- .align
-- .type idct_col_add_armv5te, %function
-- .func idct_col_add_armv5te
--idct_col_add_armv5te:
-+ @.type idct_col_add_armv5te, %function
-+ @.func idct_col_add_armv5te
-+_idct_col_add_armv5te:
- str lr, [sp, #-4]!
-
- idct_col
-@@ -608,118 +608,118 @@
- strh a2, [v2]
-
- ldr pc, [sp], #4
-- .endfunc
-+ @.endfunc
-
- .align
-- .global simple_idct_armv5te
-- .type simple_idct_armv5te, %function
-- .func simple_idct_armv5te
--simple_idct_armv5te:
-+ .global _simple_idct_armv5te
-+ @.type simple_idct_armv5te, %function
-+ @.func simple_idct_armv5te
-+_simple_idct_armv5te:
- stmfd sp!, {v1, v2, v3, v4, v5, v6, v7, fp, lr}
-
-- bl idct_row_armv5te
-+ bl _idct_row_armv5te
- add a1, a1, #16
-- bl idct_row_armv5te
-+ bl _idct_row_armv5te
- add a1, a1, #16
-- bl idct_row_armv5te
-+ bl _idct_row_armv5te
- add a1, a1, #16
-- bl idct_row_armv5te
-+ bl _idct_row_armv5te
- add a1, a1, #16
-- bl idct_row_armv5te
-+ bl _idct_row_armv5te
- add a1, a1, #16
-- bl idct_row_armv5te
-+ bl _idct_row_armv5te
- add a1, a1, #16
-- bl idct_row_armv5te
-+ bl _idct_row_armv5te
- add a1, a1, #16
-- bl idct_row_armv5te
-+ bl _idct_row_armv5te
-
- sub a1, a1, #(16*7)
-
-- bl idct_col_armv5te
-+ bl _idct_col_armv5te
- add a1, a1, #4
-- bl idct_col_armv5te
-+ bl _idct_col_armv5te
- add a1, a1, #4
-- bl idct_col_armv5te
-+ bl _idct_col_armv5te
- add a1, a1, #4
-- bl idct_col_armv5te
-+ bl _idct_col_armv5te
-
- ldmfd sp!, {v1, v2, v3, v4, v5, v6, v7, fp, pc}
-- .endfunc
-+ @.endfunc
-
- .align
-- .global simple_idct_add_armv5te
-- .type simple_idct_add_armv5te, %function
-- .func simple_idct_add_armv5te
--simple_idct_add_armv5te:
-+ .global _simple_idct_add_armv5te
-+ @.type simple_idct_add_armv5te, %function
-+ @.func simple_idct_add_armv5te
-+_simple_idct_add_armv5te:
- stmfd sp!, {a1, a2, v1, v2, v3, v4, v5, v6, v7, fp, lr}
-
- mov a1, a3
-
-- bl idct_row_armv5te
-+ bl _idct_row_armv5te
- add a1, a1, #16
-- bl idct_row_armv5te
-+ bl _idct_row_armv5te
- add a1, a1, #16
-- bl idct_row_armv5te
-+ bl _idct_row_armv5te
- add a1, a1, #16
-- bl idct_row_armv5te
-+ bl _idct_row_armv5te
- add a1, a1, #16
-- bl idct_row_armv5te
-+ bl _idct_row_armv5te
- add a1, a1, #16
-- bl idct_row_armv5te
-+ bl _idct_row_armv5te
- add a1, a1, #16
-- bl idct_row_armv5te
-+ bl _idct_row_armv5te
- add a1, a1, #16
-- bl idct_row_armv5te
-+ bl _idct_row_armv5te
-
- sub a1, a1, #(16*7)
-
-- bl idct_col_add_armv5te
-+ bl _idct_col_add_armv5te
- add a1, a1, #4
-- bl idct_col_add_armv5te
-+ bl _idct_col_add_armv5te
- add a1, a1, #4
-- bl idct_col_add_armv5te
-+ bl _idct_col_add_armv5te
- add a1, a1, #4
-- bl idct_col_add_armv5te
-+ bl _idct_col_add_armv5te
-
- add sp, sp, #8
- ldmfd sp!, {v1, v2, v3, v4, v5, v6, v7, fp, pc}
-- .endfunc
-+ @.endfunc
-
- .align
-- .global simple_idct_put_armv5te
-- .type simple_idct_put_armv5te, %function
-- .func simple_idct_put_armv5te
--simple_idct_put_armv5te:
-+ .global _simple_idct_put_armv5te
-+ @.type simple_idct_put_armv5te, %function
-+ @.func simple_idct_put_armv5te
-+_simple_idct_put_armv5te:
- stmfd sp!, {a1, a2, v1, v2, v3, v4, v5, v6, v7, fp, lr}
-
- mov a1, a3
-
-- bl idct_row_armv5te
-+ bl _idct_row_armv5te
- add a1, a1, #16
-- bl idct_row_armv5te
-+ bl _idct_row_armv5te
- add a1, a1, #16
-- bl idct_row_armv5te
-+ bl _idct_row_armv5te
- add a1, a1, #16
-- bl idct_row_armv5te
-+ bl _idct_row_armv5te
- add a1, a1, #16
-- bl idct_row_armv5te
-+ bl _idct_row_armv5te
- add a1, a1, #16
-- bl idct_row_armv5te
-+ bl _idct_row_armv5te
- add a1, a1, #16
-- bl idct_row_armv5te
-+ bl _idct_row_armv5te
- add a1, a1, #16
-- bl idct_row_armv5te
-+ bl _idct_row_armv5te
-
- sub a1, a1, #(16*7)
-
-- bl idct_col_put_armv5te
-+ bl _idct_col_put_armv5te
- add a1, a1, #4
-- bl idct_col_put_armv5te
-+ bl _idct_col_put_armv5te
- add a1, a1, #4
-- bl idct_col_put_armv5te
-+ bl _idct_col_put_armv5te
- add a1, a1, #4
-- bl idct_col_put_armv5te
-+ bl _idct_col_put_armv5te
-
- add sp, sp, #8
- ldmfd sp!, {v1, v2, v3, v4, v5, v6, v7, fp, pc}
-- .endfunc
-+ @.endfunc
-diff -ru ffmpeg-export-2008-02-26/libavcodec/armv4l/simple_idct_armv6.S ffmpeg-export-2008-02-26+iPhone/libavcodec/armv4l/simple_idct_armv6.S
---- ffmpeg-export-2008-02-26/libavcodec/armv4l/simple_idct_armv6.S 2007-07-05 20:08:51.000000000 +0000
-+++ ffmpeg-export-2008-02-26+iPhone/libavcodec/armv4l/simple_idct_armv6.S 2008-05-20 09:01:50.000000000 +0000
-@@ -191,9 +191,9 @@
- a2 = dest
- */
- .align
-- .type idct_row_armv6, %function
-- .func idct_row_armv6
--idct_row_armv6:
-+ @.type idct_row_armv6, %function
-+ @.func idct_row_armv6
-+_idct_row_armv6:
- str lr, [sp, #-4]!
-
- ldr lr, [a1, #12] /* lr = row[7,5] */
-@@ -238,7 +238,7 @@
- strh a3, [a2, #(16*5)]
- strh a3, [a2, #(16*7)]
- ldr pc, [sp], #4
-- .endfunc
-+ @.endfunc
-
- /*
- Compute IDCT of single column, read as row.
-@@ -246,9 +246,9 @@
- a2 = dest
- */
- .align
-- .type idct_col_armv6, %function
-- .func idct_col_armv6
--idct_col_armv6:
-+ @.type idct_col_armv6, %function
-+ @.func idct_col_armv6
-+_idct_col_armv6:
- stmfd sp!, {a2, lr}
-
- ldr a3, [a1] /* a3 = row[2,0] */
-@@ -268,7 +268,7 @@
- strh v5, [a2, #(16*7)]
-
- ldr pc, [sp], #4
-- .endfunc
-+ @.endfunc
-
- /*
- Compute IDCT of single column, read as row, store saturated 8-bit.
-@@ -277,9 +277,9 @@
- a3 = line size
- */
- .align
-- .type idct_col_put_armv6, %function
-- .func idct_col_put_armv6
--idct_col_put_armv6:
-+ @.type idct_col_put_armv6, %function
-+ @.func idct_col_put_armv6
-+_idct_col_put_armv6:
- stmfd sp!, {a2, a3, lr}
-
- ldr a3, [a1] /* a3 = row[2,0] */
-@@ -301,7 +301,7 @@
- sub a2, a2, a3, lsl #3
-
- ldr pc, [sp], #4
-- .endfunc
-+ @.endfunc
-
- /*
- Compute IDCT of single column, read as row, add/store saturated 8-bit.
-@@ -310,9 +310,9 @@
- a3 = line size
- */
- .align
-- .type idct_col_add_armv6, %function
-- .func idct_col_add_armv6
--idct_col_add_armv6:
-+ @.type idct_col_add_armv6, %function
-+ @.func idct_col_add_armv6
-+_idct_col_add_armv6:
- stmfd sp!, {a2, a3, lr}
-
- ldr a3, [a1] /* a3 = row[2,0] */
-@@ -359,7 +359,7 @@
- sub a2, a2, a3, lsl #3
-
- ldr pc, [sp], #4
-- .endfunc
-+ @.endfunc
-
- /*
- Compute 8 IDCT row transforms.
-@@ -394,62 +394,62 @@
- .endm
-
- .align
-- .global ff_simple_idct_armv6
-- .type ff_simple_idct_armv6, %function
-- .func ff_simple_idct_armv6
-+ .global _ff_simple_idct_armv6
-+ @.type ff_simple_idct_armv6, %function
-+ @.func ff_simple_idct_armv6
- /* void ff_simple_idct_armv6(DCTELEM *data); */
--ff_simple_idct_armv6:
-+_ff_simple_idct_armv6:
- stmfd sp!, {v1, v2, v3, v4, v5, v6, v7, fp, lr}
- sub sp, sp, #128
-
- mov a2, sp
-- idct_rows idct_row_armv6, 2
-+ idct_rows _idct_row_armv6, 2
- mov a2, a1
- mov a1, sp
-- idct_rows idct_col_armv6, 2
-+ idct_rows _idct_col_armv6, 2
-
- add sp, sp, #128
- ldmfd sp!, {v1, v2, v3, v4, v5, v6, v7, fp, pc}
-- .endfunc
-+ @.endfunc
-
- .align
-- .global ff_simple_idct_add_armv6
-- .type ff_simple_idct_add_armv6, %function
-- .func ff_simple_idct_add_armv6
-+ .global _ff_simple_idct_add_armv6
-+ @.type ff_simple_idct_add_armv6, %function
-+ @.func ff_simple_idct_add_armv6
- /* ff_simple_idct_add_armv6(uint8_t *dest, int line_size, DCTELEM *data); */
--ff_simple_idct_add_armv6:
-+_ff_simple_idct_add_armv6:
- stmfd sp!, {a1, a2, v1, v2, v3, v4, v5, v6, v7, fp, lr}
- sub sp, sp, #128
-
- mov a1, a3
- mov a2, sp
-- idct_rows idct_row_armv6, 2
-+ idct_rows _idct_row_armv6, 2
- mov a1, sp
- ldr a2, [sp, #128]
- ldr a3, [sp, #(128+4)]
-- idct_rows idct_col_add_armv6, 1
-+ idct_rows _idct_col_add_armv6, 1
-
- add sp, sp, #(128+8)
- ldmfd sp!, {v1, v2, v3, v4, v5, v6, v7, fp, pc}
-- .endfunc
-+ @.endfunc
-
- .align
-- .global ff_simple_idct_put_armv6
-- .type ff_simple_idct_put_armv6, %function
-- .func ff_simple_idct_put_armv6
-+ .global _ff_simple_idct_put_armv6
-+ @.type ff_simple_idct_put_armv6, %function
-+ @.func ff_simple_idct_put_armv6
- /* ff_simple_idct_put_armv6(uint8_t *dest, int line_size, DCTELEM *data); */
--ff_simple_idct_put_armv6:
-+_ff_simple_idct_put_armv6:
- stmfd sp!, {a1, a2, v1, v2, v3, v4, v5, v6, v7, fp, lr}
- sub sp, sp, #128
-
- mov a1, a3
- mov a2, sp
-- idct_rows idct_row_armv6, 2
-+ idct_rows _idct_row_armv6, 2
- mov a1, sp
- ldr a2, [sp, #128]
- ldr a3, [sp, #(128+4)]
-- idct_rows idct_col_put_armv6, 1
-+ idct_rows _idct_col_put_armv6, 1
-
- add sp, sp, #(128+8)
- ldmfd sp!, {v1, v2, v3, v4, v5, v6, v7, fp, pc}
-- .endfunc
-+ @.endfunc
diff --git a/data/ffmpeg_/ffmpeg-4.0.2.tar.gz b/data/ffmpeg_/ffmpeg-4.0.2.tar.gz
new file mode 100644
index 000000000..6deabe048
--- /dev/null
+++ b/data/ffmpeg_/ffmpeg-4.0.2.tar.gz
Binary files differ
diff --git a/data/ffmpeg_/ffmpeg-export-snapshot.tar.bz2 b/data/ffmpeg_/ffmpeg-export-snapshot.tar.bz2
deleted file mode 100644
index 56cf50555..000000000
--- a/data/ffmpeg_/ffmpeg-export-snapshot.tar.bz2
+++ /dev/null
Binary files differ
diff --git a/data/ffmpeg_/make.sh b/data/ffmpeg_/make.sh
index f16f6f208..1760afb65 100644
--- a/data/ffmpeg_/make.sh
+++ b/data/ffmpeg_/make.sh
@@ -1,13 +1,12 @@
pkg:setup
-./configure \
+ARCH=$(echo ${PKG_TARG} | sed -e s/'-.*'//)
+./configure --arch=${ARCH} \
--prefix=/usr --enable-gpl --enable-postproc --enable-swscale \
- --disable-vhook --enable-avfilter --enable-avfilter-lavf \
+ --enable-avfilter \
--enable-cross-compile --cross-prefix=${PKG_TARG}- --target-os=darwin \
- --arch=arm --disable-iwmmxt --enable-armv5te --enable-armv6 \
--disable-static --enable-shared --disable-debug --disable-stripping \
- --enable-libfaac \
- --enable-libfaad \
+ --enable-libfdk-aac \
--enable-libmp3lame \
- --enable-libvorbis
+ --enable-libvorbis --enable-nonfree
make
pkg:install
diff --git a/data/ffmpeg_/mjpega.diff b/data/ffmpeg_/mjpega.diff
deleted file mode 100644
index c82baa8d3..000000000
--- a/data/ffmpeg_/mjpega.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ru ffmpeg-export-2008-05-20/libavcodec/mjpega_dump_header_bsf.c ffmpeg-export-2008-05-20+iPhone/libavcodec/mjpega_dump_header_bsf.c
---- ffmpeg-export-2008-05-20/libavcodec/mjpega_dump_header_bsf.c 2007-05-19 00:53:41.000000000 +0000
-+++ ffmpeg-export-2008-05-20+iPhone/libavcodec/mjpega_dump_header_bsf.c 2008-06-02 02:56:08.000000000 +0000
-@@ -56,15 +56,24 @@
- bytestream_put_be32(&poutbufp, buf_size + 44); /* pad field size */
- bytestream_put_be32(&poutbufp, 0); /* next ptr */
-
-+ uint32_t dqt = 0, dht = 0, sof0 = 0;
-+
- for (i = 0; i < buf_size - 1; i++) {
- if (buf[i] == 0xff) {
- switch (buf[i + 1]) {
-- case DQT: /* quant off */
-- case DHT: /* huff off */
-- case SOF0: /* image off */
-- bytestream_put_be32(&poutbufp, i + 46);
-+ case DQT:
-+ dqt = i + 46;
-+ break;
-+ case DHT:
-+ dht = i + 46;
-+ break;
-+ case SOF0:
-+ sof0 = i + 46;
- break;
- case SOS:
-+ bytestream_put_be32(&poutbufp, dqt); /* quant off */
-+ bytestream_put_be32(&poutbufp, dht); /* huff off */
-+ bytestream_put_be32(&poutbufp, sof0); /* image off */
- bytestream_put_be32(&poutbufp, i + 46); /* scan off */
- bytestream_put_be32(&poutbufp, i + 46 + AV_RB16(buf + i + 2)); /* data off */
- bytestream_put_buffer(&poutbufp, buf + 2, buf_size - 2); /* skip already written SOI */
diff --git a/data/ffmpeg_/r7.diff b/data/ffmpeg_/r7.diff
deleted file mode 100644
index 3b1af70fb..000000000
--- a/data/ffmpeg_/r7.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-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
diff --git a/data/ffmpeg_/timestamp.diff b/data/ffmpeg_/timestamp.diff
deleted file mode 100644
index 266e7d614..000000000
--- a/data/ffmpeg_/timestamp.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru ffmpeg-export-2008-05-20/cmdutils.c ffmpeg-export-2008-05-20+iPhone/cmdutils.c
---- ffmpeg-export-2008-05-20/cmdutils.c 2008-05-09 11:56:36.000000000 +0000
-+++ ffmpeg-export-2008-05-20+iPhone/cmdutils.c 2008-06-19 04:35:45.000000000 +0000
-@@ -206,7 +206,6 @@
- #if ENABLE_AVFILTER
- fprintf(stderr, " libavfilter version: " AV_STRINGIFY(LIBAVFILTER_VERSION) "\n");
- #endif
-- fprintf(stderr, " built on " __DATE__ " " __TIME__);
- #ifdef __GNUC__
- fprintf(stderr, ", gcc: " __VERSION__ "\n");
- #else
diff --git a/data/ffmpeg_/version.diff b/data/ffmpeg_/version.diff
deleted file mode 100644
index 4670687d1..000000000
--- a/data/ffmpeg_/version.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru ffmpeg-export-2008-05-20/configure ffmpeg-export-2008-05-20+iPhone/configure
---- ffmpeg-export-2008-05-20/configure 2008-05-16 16:12:55.000000000 +0000
-+++ ffmpeg-export-2008-05-20+iPhone/configure 2008-09-22 08:28:33.000000000 +0000
-@@ -1212,7 +1212,7 @@
- ;;
- darwin)
- disable need_memalign
-- SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME),-current_version,$(LIBVERSION),-compatibility_version,$(LIBMAJOR) -Wl,-read_only_relocs,suppress'
-+ SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME) -Wl,-read_only_relocs,suppress'
- VHOOKSHFLAGS='-dynamiclib -Wl,-single_module -flat_namespace -undefined suppress -Wl,-install_name,$(SHLIBDIR)/vhook/$$(@F)'
- strip="strip -x"
- FFLDFLAGS="-Wl,-dynamic,-search_paths_first"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 23:20:46 +0000