r632 - in trunk: . transcode

jim at linuxfromscratch.org jim at linuxfromscratch.org
Tue Sep 7 21:41:07 PDT 2004


Author: jim
Date: 2004-09-07 22:41:05 -0600 (Tue, 07 Sep 2004)
New Revision: 632

Added:
   trunk/transcode/
   trunk/transcode/transcode-0.6.12-fix_dv-1.patch
   trunk/transcode/transcode-0.6.12-fix_largefile_split-1.patch
   trunk/transcode/transcode-0.6.12-gcc34-1.patch
Log:
Added: transcode patches

Added: trunk/transcode/transcode-0.6.12-fix_dv-1.patch
===================================================================
--- trunk/transcode/transcode-0.6.12-fix_dv-1.patch	2004-09-08 04:40:26 UTC (rev 631)
+++ trunk/transcode/transcode-0.6.12-fix_dv-1.patch	2004-09-08 04:41:05 UTC (rev 632)
@@ -0,0 +1,27 @@
+Submitted By:            Randy McMurchy <randy_at_linuxfromscratch_dot_org>
+Date:                    2004-09-04
+Initial Package Version: 0.6.12
+Upstream Status:         Not submitted 
+Origin:                  http://zebra.fh-weingarten.de/~maxi/html/transcode-users/2004-08/msg00233.html
+Description:             Fixes build when linking libdv
+
+diff -Naur transcode-0.6.12-orig/import/decode_dv.c transcode-0.6.12/import/decode_dv.c
+--- transcode-0.6.12-orig/import/decode_dv.c	2003-12-20 11:49:13.000000000 +0000
++++ transcode-0.6.12/import/decode_dv.c	2004-09-05 01:10:40.487460896 +0000
+@@ -37,8 +37,14 @@
+ #include "transcode.h"
+ #include "ioaux.h"
+ 
+-#define DV_PAL_SIZE    frame_size_625_50
+-#define DV_NTSC_SIZE   frame_size_525_60
++/* #define DV_PAL_SIZE    frame_size_625_50
++#define DV_NTSC_SIZE   frame_size_525_60 */
++
++static const int frame_size_625_50 = 12 * 150 * 80;
++static const int frame_size_525_60 = 10 * 150 * 80;
++#define DV_PAL_SIZE 12 * 150 * 80
++#define DV_NTSC_SIZE  10 * 150 * 8
++
+ #define DV_HEADER_SIZE header_size
+ 
+ static int verbose=TC_QUIET;

Added: trunk/transcode/transcode-0.6.12-fix_largefile_split-1.patch
===================================================================
--- trunk/transcode/transcode-0.6.12-fix_largefile_split-1.patch	2004-09-08 04:40:26 UTC (rev 631)
+++ trunk/transcode/transcode-0.6.12-fix_largefile_split-1.patch	2004-09-08 04:41:05 UTC (rev 632)
@@ -0,0 +1,37 @@
+Submitted By:            Randy McMurchy <randy_at_linuxfromscratch_dot_org>
+Date:                    2004-09-05
+Initial Package Version: 0.6.12
+Upstream Status:         Not submitted 
+Origin:                  http://zebra.fh-weingarten.de/~maxi/html/transcode-users/2004-01/msg00504.html
+Description:             Fixes corrupted files created by splitting a large file into smaller files
+
+diff -Naur transcode-0.6.12-orig/avilib/avilib.c transcode-0.6.12/avilib/avilib.c
+--- transcode-0.6.12-orig/avilib/avilib.c	2004-01-02 15:12:38.000000000 +0000
++++ transcode-0.6.12/avilib/avilib.c	2004-09-05 14:50:36.833479496 +0000
+@@ -165,10 +165,13 @@
+ }
+ 
+ 
+-// if bit 31 is not 0, its a keyframe
++// if bit 31 is 0, its a keyframe
+ static uint32_t str2ulong_key (unsigned char *str)
+ {
+-   return (str2ulong(str) & 0x80000000)?0:0x10;
++  uint32_t c = str2ulong(str);
++  c &= 0x80000000;
++  if (c == 0) return 0x10;
++  else return 0;
+ }
+ 
+ /* Calculate audio sample size from number of bits and number of channels.
+@@ -360,7 +363,9 @@
+     if(len>AVI->max_len) AVI->max_len=len;
+ 
+     // if bit 31 is set, it is NOT a keyframe
+-    if (flags != 0x10) len |= (1 << 30) & 0x80000000;
++    if (flags != 0x10) {
++	len |= 0x80000000;
++    }
+ 
+     si->aIndex [ cur_chunk_idx ].dwSize = len;
+     si->aIndex [ cur_chunk_idx ].dwOffset = 

Added: trunk/transcode/transcode-0.6.12-gcc34-1.patch
===================================================================
--- trunk/transcode/transcode-0.6.12-gcc34-1.patch	2004-09-08 04:40:26 UTC (rev 631)
+++ trunk/transcode/transcode-0.6.12-gcc34-1.patch	2004-09-08 04:41:05 UTC (rev 632)
@@ -0,0 +1,88 @@
+Submitted By:            Randy McMurchy <randy_at_linuxfromscratch_dot_org>
+Date:                    2004-09-04
+Initial Package Version: 0.6.12
+Upstream Status:         Not submitted 
+Origin:                  Randy McMurchy
+Description:             Fixes GCC-3.4 related build problems
+
+diff -Naur 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 13:12:55.000000000 +0000
++++ transcode-0.6.12/filter/subtitler/frame_list.c	2004-09-05 02:17:32.368562264 +0000
+@@ -33,7 +33,8 @@
+ 
+ char *strsave(char *s) /*save char array s somewhere*/
+ {
+-char *p, *malloc();
++/* char *p, *malloc(); */
++char *p;
+ if(p = malloc( strlen(s) +  1) ) strcpy(p, s);
+ return(p);
+ }
+
+diff -Naur 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-09-05 02:04:32.318147952 +0000
+@@ -45,10 +45,10 @@
+ #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;
++const uint64_t __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000ULL;
++const uint64_t __attribute__((aligned(8))) d40000= 0x0000000000040000ULL;
+ 
+-static const int16_t __attribute__((aligned(8))) coeffs[]= {
++const int16_t __attribute__((aligned(8))) coeffs[]= {
+ 	1<<(ROW_SHIFT-1), 0, 1<<(ROW_SHIFT-1), 0,
+ //	1<<(COL_SHIFT-1), 0, 1<<(COL_SHIFT-1), 0,
+ //	0, 1<<(COL_SHIFT-1-16), 0, 1<<(COL_SHIFT-1-16),
+
+diff -Naur 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-09-05 02:06:37.490118920 +0000
+@@ -20,13 +20,13 @@
+  */
+ #include "../dsputil.h"
+ 
+-static const __attribute__ ((aligned(8))) uint64_t round_tab[3]={
++const __attribute__ ((aligned(8))) uint64_t round_tab[3]={
+ 0x0000000000000000ULL,
+ 0x0001000100010001ULL,
+ 0x0002000200020002ULL,
+ };
+ 
+-static __attribute__ ((aligned(8), unused)) uint64_t bone= 0x0101010101010101LL;
++const __attribute__ ((aligned(8), unused)) uint64_t bone= 0x0101010101010101LL;
+ 
+ static inline void sad8_mmx(uint8_t *blk1, uint8_t *blk2, int stride, int h)
+ {
+
+diff -Naur 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-09-05 02:08:27.098455920 +0000
+@@ -27,16 +27,16 @@
+ int mm_flags; /* multimedia extension flags */
+ 
+ /* pixel operations */
+-static const uint64_t mm_bone __attribute__ ((aligned(8))) = 0x0101010101010101ULL;
+-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_16 __attribute__ ((aligned(8))) = 0x0010001000100010ULL;
+-static const uint64_t ff_pw_15 __attribute__ ((aligned(8))) = 0x000F000F000F000FULL;
++const uint64_t mm_bone __attribute__ ((aligned(8))) = 0x0101010101010101ULL;
++const uint64_t mm_wone __attribute__ ((aligned(8))) = 0x0001000100010001ULL;
++const uint64_t mm_wtwo __attribute__ ((aligned(8))) = 0x0002000200020002ULL;
++
++const uint64_t ff_pw_20 __attribute__ ((aligned(8))) = 0x0014001400140014ULL;
++const uint64_t ff_pw_3  __attribute__ ((aligned(8))) = 0x0003000300030003ULL;
++const uint64_t ff_pw_16 __attribute__ ((aligned(8))) = 0x0010001000100010ULL;
++const uint64_t ff_pw_15 __attribute__ ((aligned(8))) = 0x000F000F000F000FULL;
+ 
+-static const uint64_t ff_pb_FC __attribute__ ((aligned(8))) = 0xFCFCFCFCFCFCFCFCULL;
++const uint64_t ff_pb_FC __attribute__ ((aligned(8))) = 0xFCFCFCFCFCFCFCFCULL;
+ 
+ #define JUMPALIGN() __asm __volatile (".balign 8"::)
+ #define MOVQ_ZERO(regd)  __asm __volatile ("pxor %%" #regd ", %%" #regd ::)




More information about the patches mailing list