diff options
Diffstat (limited to 'media-video/transcode/files')
7 files changed, 2 insertions, 311 deletions
diff --git a/media-video/transcode/files/digest-transcode-0.6.14-r3 b/media-video/transcode/files/digest-transcode-0.6.14-r3 new file mode 100644 index 000000000000..4b71c1b7433b --- /dev/null +++ b/media-video/transcode/files/digest-transcode-0.6.14-r3 @@ -0,0 +1,2 @@ +MD5 9bfef83b7e0fe2c27d25d871fef75a92 transcode-0.6.14.tar.gz 2614579 +MD5 a6e3d7b38d653a09ef1fb230fe334512 transcode-patches-0.6.14-r3.tbz2 2534 diff --git a/media-video/transcode/files/transcode-0.6.11-no-mmx.patch b/media-video/transcode/files/transcode-0.6.11-no-mmx.patch deleted file mode 100644 index 12a69f41b9ab..000000000000 --- a/media-video/transcode/files/transcode-0.6.11-no-mmx.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -urpN transcode-0.6.11/config.h.in transcode-0.6.11.az/config.h.in ---- transcode-0.6.11/config.h.in 2003-11-06 22:00:11.037925040 +0200 -+++ transcode-0.6.11.az/config.h.in 2003-11-06 21:53:14.481251280 +0200 -@@ -1,3 +1,6 @@ -+#ifndef __CONFIG_H -+#define __CONFIG_H -+ - /* config.h.in. Generated from configure.in by autoheader. */ - - /* Define if your CPU is PPC */ -@@ -390,3 +393,5 @@ - - /* Define to `unsigned' if <sys/types.h> does not define. */ - #undef size_t -+ -+#endif /* __CONFIG_H */ -diff -urpN transcode-0.6.11/ffmpeg/av_config.h transcode-0.6.11.az/ffmpeg/av_config.h ---- transcode-0.6.11/ffmpeg/av_config.h 2003-11-06 22:00:11.038924888 +0200 -+++ transcode-0.6.11.az/ffmpeg/av_config.h 2003-11-06 22:04:33.472028992 +0200 -@@ -1,4 +1,12 @@ - /* Map transcode configure defines to libavcodecs */ -+#ifndef __AV_CONFIG_H -+#define __AV_CONFIG_H -+ -+/* Kludge to see if we had HAVE_MMX defined before we included -+ * config.h - see below ... */ -+#ifndef HAVE_MMX -+#define HAD_MMX_FALSE -+#endif - - #include "config.h" - -@@ -15,6 +23,13 @@ - # define ARCH_POWERPC - #endif - -+/* We use HAVE_MMX, but for ffmpeg the Makefile's set it, so -+ * unset it here, else ffmpeg use MMX constructs, even if we -+ * have --disable-mmx */ -+#if defined(HAD_MMX_FALSE) && defined(HAVE_MMX) -+#undef HAVE_MMX -+#endif -+ - #ifdef HAVE_DLOPEN - # define CONFIG_HAVE_DLOPEN 1 - #endif -@@ -44,3 +59,5 @@ - #define CONFIG_ZLIB 1 - #define SIMPLE_IDCT 1 - #define restrict __restrict__ -+ -+#endif /* __AV_CONFIG_H */ diff --git a/media-video/transcode/files/transcode-0.6.12-gcc-3.4.patch b/media-video/transcode/files/transcode-0.6.12-gcc-3.4.patch deleted file mode 100644 index 43e1ca8dde34..000000000000 --- a/media-video/transcode/files/transcode-0.6.12-gcc-3.4.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -ur transcode-0.6.12.orig/ffmpeg/libavcodec/i386/dsputil_mmx.c transcode-0.6.12/ffmpeg/libavcodec/i386/dsputil_mmx.c ---- transcode-0.6.12.orig/ffmpeg/libavcodec/i386/dsputil_mmx.c 2003-12-30 10:02:10.000000000 +0000 -+++ transcode-0.6.12/ffmpeg/libavcodec/i386/dsputil_mmx.c 2004-05-21 19:47:12.808592624 +0000 -@@ -31,8 +31,8 @@ - static const uint64_t mm_wone __attribute__ ((aligned(8))) = 0x0001000100010001ULL; - static const uint64_t mm_wtwo __attribute__ ((aligned(8))) = 0x0002000200020002ULL; - --static const uint64_t ff_pw_20 __attribute__ ((aligned(8))) = 0x0014001400140014ULL; --static const uint64_t ff_pw_3 __attribute__ ((aligned(8))) = 0x0003000300030003ULL; -+static const uint64_t ff_pw_20 __attribute__ ((aligned(8), used)) = 0x0014001400140014ULL; -+static const uint64_t ff_pw_3 __attribute__ ((aligned(8), used)) = 0x0003000300030003ULL; - static const uint64_t ff_pw_16 __attribute__ ((aligned(8))) = 0x0010001000100010ULL; - static const uint64_t ff_pw_15 __attribute__ ((aligned(8))) = 0x000F000F000F000FULL; - -diff -ur transcode-0.6.12.orig/ffmpeg/libavcodec/i386/motion_est_mmx.c transcode-0.6.12/ffmpeg/libavcodec/i386/motion_est_mmx.c ---- transcode-0.6.12.orig/ffmpeg/libavcodec/i386/motion_est_mmx.c 2003-12-30 10:02:10.000000000 +0000 -+++ transcode-0.6.12/ffmpeg/libavcodec/i386/motion_est_mmx.c 2004-05-21 19:44:37.969131800 +0000 -@@ -26,7 +26,7 @@ - 0x0002000200020002ULL, - }; - --static __attribute__ ((aligned(8), unused)) uint64_t bone= 0x0101010101010101LL; -+static __attribute__ ((aligned(8), used)) uint64_t bone= 0x0101010101010101LL; - - static inline void sad8_mmx(uint8_t *blk1, uint8_t *blk2, int stride, int h) - { -diff -ur transcode-0.6.12.orig/ffmpeg/libavcodec/i386/simple_idct_mmx.c transcode-0.6.12/ffmpeg/libavcodec/i386/simple_idct_mmx.c ---- transcode-0.6.12.orig/ffmpeg/libavcodec/i386/simple_idct_mmx.c 2003-12-20 11:49:12.000000000 +0000 -+++ transcode-0.6.12/ffmpeg/libavcodec/i386/simple_idct_mmx.c 2004-05-21 19:48:06.594415936 +0000 -@@ -45,8 +45,8 @@ - #define ROW_SHIFT 11 - #define COL_SHIFT 20 // 6 - --static const uint64_t __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000ULL; --static const uint64_t __attribute__((aligned(8))) d40000= 0x0000000000040000ULL; -+static const uint64_t __attribute__((aligned(8), used)) wm1010= 0xFFFF0000FFFF0000ULL; -+static const uint64_t __attribute__((aligned(8), used)) d40000= 0x0000000000040000ULL; - - static const int16_t __attribute__((aligned(8))) coeffs[]= { - 1<<(ROW_SHIFT-1), 0, 1<<(ROW_SHIFT-1), 0, diff --git a/media-video/transcode/files/transcode-0.6.12-r2-dvdmenu.patch b/media-video/transcode/files/transcode-0.6.12-r2-dvdmenu.patch deleted file mode 100644 index 5dd808d3c23d..000000000000 --- a/media-video/transcode/files/transcode-0.6.12-r2-dvdmenu.patch +++ /dev/null @@ -1,143 +0,0 @@ ---- transcode-0.6.12/bbmpeg/mplex.h.old 2004-09-22 17:26:14.722188082 -0700 -+++ transcode-0.6.12/bbmpeg/mplex.h 2004-09-22 17:26:48.601657790 -0700 -@@ -364,7 +364,9 @@ - unsigned int write_seq_end, - unsigned int write_seq_hdr, - unsigned int sh_length, -- unsigned char *seq_hdr); -+ unsigned char *seq_hdr, -+ unsigned int nsyncwords, -+ unsigned int firstsync); - - void create_sys_header ( /* erstellt einen System Header */ - Sys_header_struc *sys_header, ---- transcode-0.6.12/bbmpeg/tcmplex/multplex.c.old 2004-09-22 17:27:04.443007097 -0700 -+++ transcode-0.6.12/bbmpeg/tcmplex/multplex.c 2004-09-22 17:32:41.781855873 -0700 -@@ -1787,7 +1787,7 @@ - istream_v, VIDEO_STR_0, 0, 1, video_buffer_size/1024, - video_PSTD, &PTSsave, &DTSsave, timestamps, which_streams, 0, i, - do_broken_link, (start_new_file || stop_output) && write_end_codes, -- do_sequence_header, sh_length, seq_hdr)) -+ do_sequence_header, sh_length, seq_hdr, 0, 0)) - return FALSE; - - -@@ -1899,6 +1899,7 @@ - Timecode_struc PTSsave; - int eos, tcfound; - char tmpStr[100]; -+ unsigned int nsyncwords, firstsync; /* firstsync is 1-based */ - - if (marker_pack) - { -@@ -1938,6 +1939,8 @@ - - tcfound = 0; - eos = 0; -+ nsyncwords = 0; -+ firstsync = 0; - /* Let's generate packet */ - - /* does a audio frame start in this packet? */ -@@ -1945,6 +1948,8 @@ - /* CASE: packet starts with new access unit */ - if (*audio_frame_start) - { -+ nsyncwords++; -+ firstsync = 1; - timestamps = (mplex_type > MPEG_VCD) ? MPEG2_TIMESTAMPS_PTS : MPEG1_TIMESTAMPS_PTS; - PTSsave = audio_au->PTS; - tcfound = 1; -@@ -1979,6 +1984,9 @@ - *audio_counter = *audio_counter + 1; - if ((!restart_output && !stop_output) || (get_timecode(&audio_au->PTS) < start_video_PTS)) - { -+ nsyncwords++; -+ if (!firstsync) -+ firstsync = temp + 1; - add_to_timecode(SCR_delay, &audio_au->PTS); - if (temp + audio_au->length > packet_data_size) - { -@@ -2023,7 +2031,8 @@ - if (!create_sector(§or, pack_ptr, sys_header_ptr, - packet_data_size, temp, - istream_a, aid, audio_subid, abuffer_scale, abuffer_size, -- audio_PSTD, &PTSsave, NULL, timestamps, which_streams, k, 0, 0, 0, 0, 0, NULL)) -+ audio_PSTD, &PTSsave, NULL, timestamps, which_streams, k, 0, 0, 0, 0, 0, NULL, -+ nsyncwords, firstsync)) - return FALSE; - - *audio_frame_start = FALSE; -@@ -2186,7 +2195,7 @@ - i, i, - NULL, PADDING_STR, 0, 0, 0, - FALSE, NULL, NULL, -- TIMESTAMPS_NO, j, k, 0, 0, 0, 0, 0, NULL); -+ TIMESTAMPS_NO, j, k, 0, 0, 0, 0, 0, NULL, 0, 0); - - if (output_on) - { ---- transcode-0.6.12/bbmpeg/tcmplex/systems.c.old 2004-09-22 17:32:58.548108803 -0700 -+++ transcode-0.6.12/bbmpeg/tcmplex/systems.c 2004-09-22 17:35:56.562559425 -0700 -@@ -32,10 +32,12 @@ - unsigned int write_seq_end, - unsigned int write_seq_hdr, - unsigned int sh_length, --unsigned char *seq_hdr) -+unsigned char *seq_hdr, -+unsigned int nsyncwords, -+unsigned int firstsync) - { -- int i, j, data_bytes, numFound, syncFound, firstOffset, pad_size; -- unsigned char *index, *tmpPtr=NULL; -+ int i, j, data_bytes, pad_size; -+ unsigned char *index; - unsigned int data_size, stuff_size, k; - unsigned int l; - -@@ -329,41 +331,14 @@ - if (type == PRIVATE_STREAM1) - { - *(index++) = subtype; -- tmpPtr = index; // remember for AC3 data -- *(index++) = 0; // num of AC3 syncwords in packet -- *(index++) = 0; // hi offset of first AC3 syncword -- *(index++) = 0; // lo offset of first AC3 syncword (starting at 1) -+ *(index++) = nsyncwords; // num of AC3 syncwords in packet -+ *(index++) = firstsync >> 8; // hi offset of first AC3 syncword -+ // (starting at 1) -+ *(index++) = firstsync & 0xFF; // lo offset of first AC3 syncword - data_bytes -= 4; - } - - memcpy(index, data_buffer, data_bytes); -- if (type == PRIVATE_STREAM1) -- { -- numFound = 0; -- syncFound = 0; -- firstOffset = 0; -- for (j = 0; j < data_bytes; j++) -- { -- switch (syncFound) -- { -- case 0: -- if (index[j] == 0x0b) -- syncFound = 1; -- break; -- case 1: -- if (index[j] == 0x77) -- { -- numFound++; -- if (numFound == 1) -- firstOffset = j; -- } -- syncFound = 0; -- } -- } -- tmpPtr[0] = (unsigned char) numFound; -- tmpPtr[1] = (unsigned char) (firstOffset >> 8); -- tmpPtr[2] = (unsigned char) (firstOffset & 0xff); -- } - index += data_bytes; - - if (type == PRIVATE_STREAM1) diff --git a/media-video/transcode/files/transcode-0.6.12-r2-gcc34.patch b/media-video/transcode/files/transcode-0.6.12-r2-gcc34.patch deleted file mode 100644 index 91af9e076c1c..000000000000 --- a/media-video/transcode/files/transcode-0.6.12-r2-gcc34.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -ur transcode-0.6.12.orig/ffmpeg/libavcodec/i386/dsputil_mmx.c transcode-0.6.12/ffmpeg/libavcodec/i386/dsputil_mmx.c ---- transcode-0.6.12.orig/ffmpeg/libavcodec/i386/dsputil_mmx.c 2003-12-30 10:02:10.000000000 +0000 -+++ transcode-0.6.12/ffmpeg/libavcodec/i386/dsputil_mmx.c 2004-05-21 19:47:12.808592624 +0000 -@@ -31,8 +31,8 @@ - static const uint64_t mm_wone __attribute__ ((aligned(8))) = 0x0001000100010001ULL; - static const uint64_t mm_wtwo __attribute__ ((aligned(8))) = 0x0002000200020002ULL; - --static const uint64_t ff_pw_20 __attribute__ ((aligned(8))) = 0x0014001400140014ULL; --static const uint64_t ff_pw_3 __attribute__ ((aligned(8))) = 0x0003000300030003ULL; -+static const uint64_t ff_pw_20 __attribute__ ((aligned(8), used)) = 0x0014001400140014ULL; -+static const uint64_t ff_pw_3 __attribute__ ((aligned(8), used)) = 0x0003000300030003ULL; - static const uint64_t ff_pw_16 __attribute__ ((aligned(8))) = 0x0010001000100010ULL; - static const uint64_t ff_pw_15 __attribute__ ((aligned(8))) = 0x000F000F000F000FULL; - -diff -ur transcode-0.6.12.orig/ffmpeg/libavcodec/i386/motion_est_mmx.c transcode-0.6.12/ffmpeg/libavcodec/i386/motion_est_mmx.c ---- transcode-0.6.12.orig/ffmpeg/libavcodec/i386/motion_est_mmx.c 2003-12-30 10:02:10.000000000 +0000 -+++ transcode-0.6.12/ffmpeg/libavcodec/i386/motion_est_mmx.c 2004-05-21 19:44:37.969131800 +0000 -@@ -26,7 +26,7 @@ - 0x0002000200020002ULL, - }; - --static __attribute__ ((aligned(8), unused)) uint64_t bone= 0x0101010101010101LL; -+static __attribute__ ((aligned(8), used)) uint64_t bone= 0x0101010101010101LL; - - static inline void sad8_mmx(uint8_t *blk1, uint8_t *blk2, int stride, int h) - { -diff -ur transcode-0.6.12.orig/ffmpeg/libavcodec/i386/simple_idct_mmx.c transcode-0.6.12/ffmpeg/libavcodec/i386/simple_idct_mmx.c ---- transcode-0.6.12.orig/ffmpeg/libavcodec/i386/simple_idct_mmx.c 2003-12-20 11:49:12.000000000 +0000 -+++ transcode-0.6.12/ffmpeg/libavcodec/i386/simple_idct_mmx.c 2004-05-21 19:48:06.594415936 +0000 -@@ -45,8 +45,8 @@ - #define ROW_SHIFT 11 - #define COL_SHIFT 20 // 6 - --static const uint64_t __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000ULL; --static const uint64_t __attribute__((aligned(8))) d40000= 0x0000000000040000ULL; -+static const uint64_t __attribute__((aligned(8), used)) wm1010= 0xFFFF0000FFFF0000ULL; -+static const uint64_t __attribute__((aligned(8), used)) d40000= 0x0000000000040000ULL; - - static const int16_t __attribute__((aligned(8))) coeffs[]= { - 1<<(ROW_SHIFT-1), 0, 1<<(ROW_SHIFT-1), 0, -diff -ur transcode-0.6.12.orig/filter/subtitler/frame_list.c transcode-0.6.12/filter/subtitler/frame_list.c ---- transcode-0.6.12.orig/filter/subtitler/frame_list.c 2004-01-05 07:12:55.000000000 -0600 -+++ transcode-0.6.12/filter/subtitler/frame_list.c 2004-04-24 23:48:19.275043224 -0500 -@@ -33,7 +33,7 @@ - - char *strsave(char *s) /*save char array s somewhere*/ - { --char *p, *malloc(); -+char *p; - if(p = malloc( strlen(s) + 1) ) strcpy(p, s); - return(p); - } diff --git a/media-video/transcode/files/transcode-0.6.13-r1-bitstream.patch b/media-video/transcode/files/transcode-0.6.13-r1-bitstream.patch deleted file mode 100644 index 0290899342a1..000000000000 --- a/media-video/transcode/files/transcode-0.6.13-r1-bitstream.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u3 -rN transcode-0.6.13/libac3/bitstream.c transcode-0.6.13-patched/libac3/bitstream.c ---- transcode-0.6.13/libac3/bitstream.c 2004-10-17 23:56:50.000000000 +0100 -+++ transcode-0.6.13-patched/libac3/bitstream.c 2004-10-28 19:37:06.497339637 +0100 -@@ -97,7 +97,7 @@ - static inline void - bitstream_fill_current() - { -- current_word = *(buffer_start)++; -+ current_word = *((uint_32*)buffer_start)++; - current_word = swab32(current_word); - } - diff --git a/media-video/transcode/files/transcode-gcc34.patch b/media-video/transcode/files/transcode-gcc34.patch deleted file mode 100644 index 36fe961fddd6..000000000000 --- a/media-video/transcode/files/transcode-gcc34.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur transcode-0.6.12.orig/filter/subtitler/frame_list.c transcode-0.6.12/filter/subtitler/frame_list.c ---- transcode-0.6.12.orig/filter/subtitler/frame_list.c 2004-01-05 07:12:55.000000000 -0600 -+++ transcode-0.6.12/filter/subtitler/frame_list.c 2004-04-24 23:48:19.275043224 -0500 -@@ -33,7 +33,7 @@ - - char *strsave(char *s) /*save char array s somewhere*/ - { --char *p, *malloc(); -+char *p; - if(p = malloc( strlen(s) + 1) ) strcpy(p, s); - return(p); - } |