forgot these

This commit is contained in:
sturm 2004-06-24 19:29:18 +00:00
parent 7ec648a2a8
commit d58c0e4dd1
8 changed files with 130 additions and 0 deletions

View File

@ -0,0 +1,20 @@
$OpenBSD: patch-avilib_Makefile_in,v 1.1 2004/06/24 19:29:18 sturm Exp $
--- avilib/Makefile.in.orig 2004-06-18 18:52:14.000000000 -0700
+++ avilib/Makefile.in 2004-06-18 19:17:11.000000000 -0700
@@ -69,7 +69,7 @@ CCAS = @CCAS@
CCASFLAGS = @CCASFLAGS@
CCDEPMODE = @CCDEPMODE@
-CFLAGS = -funroll-loops -ffast-math -DLINUX -Wall @CFLAGS@
+CFLAGS = -fPIC -DPIC -funroll-loops -ffast-math -DLINUX -Wall @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
@@ -365,6 +365,7 @@ libavi.a: $(libavi_a_OBJECTS) $(libavi_a
-rm -f libavi.a
$(libavi_a_AR) libavi.a $(libavi_a_OBJECTS) $(libavi_a_LIBADD)
$(RANLIB) libavi.a
+ cp libavi.a libavi_pic.a
mostlyclean-compile:
-rm -f *.$(OBJEXT) core *.core

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-export_export_fame_c,v 1.1 2004/06/24 19:29:18 sturm Exp $
--- export/export_fame.c.orig 2003-07-24 09:46:24.000000000 -0700
+++ export/export_fame.c 2004-05-21 01:04:31.000000000 -0700
@@ -62,7 +62,7 @@ static FILE *logfilein;
int read_stats(fame_frame_statistics_t *stats)
{
- fscanf(logfilein, "Frame: %d coding %c target %d actual %d activity %d quant %d\n",
+ fscanf(logfilein, "Frame: %d coding %c target %d actual %d activity %d quant %f\n",
&stats->frame_number,
&stats->coding,
&stats->target_bits,
@@ -77,7 +77,7 @@ int read_stats(fame_frame_statistics_t *
void print_stats(fame_frame_statistics_t *stats)
{
- fprintf(logfileout, "Frame: %6d coding %c target %7d actual %7d activity %8d quant %2d\n",
+ fprintf(logfileout, "Frame: %6d coding %c target %7d actual %7d activity %8d quant %f\n",
stats->frame_number,
stats->coding,
stats->target_bits,

View File

@ -0,0 +1,20 @@
$OpenBSD: patch-export_export_mov_c,v 1.1 2004/06/24 19:29:18 sturm Exp $
--- export/export_mov.c.orig 2004-05-10 18:23:59.000000000 -0700
+++ export/export_mov.c 2004-05-10 18:25:11.000000000 -0700
@@ -130,6 +130,7 @@ MOD_open
MOD_init
{
/* video setup -------------------------------------------------- */
+ int divx_bitrate;
if(param->flag == TC_VIDEO) {
char *qt_codec;
@@ -218,7 +219,7 @@ MOD_init
/* set codec parameters */
// if max bitrate > bitrate use difference for bitrate tolerance
- int divx_bitrate = vob->divxbitrate * 1000; // tc uses kb
+ divx_bitrate = vob->divxbitrate * 1000; // tc uses kb
if (vob->video_max_bitrate > vob->divxbitrate) div3_bitrate_tolerance = (vob->video_max_bitrate - vob->divxbitrate) * 1000; //kb again
/* set codec parameters */

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-import_decode_mov_c,v 1.1 2004/06/24 19:29:18 sturm Exp $
--- import/decode_mov.c.orig 2004-05-21 00:54:40.000000000 -0700
+++ import/decode_mov.c 2004-05-21 00:54:40.000000000 -0700
@@ -313,7 +313,7 @@ void decode_mov(decode_t *decode)
else
{
quicktime_close(p_qt_structure);
- fprintf(stderr,"(%s) error: unknown format mode (0x%x) \n",__FILE__,decode->format);
+ fprintf(stderr,"(%s) error: unknown format mode (0x%lx) \n",__FILE__,decode->format);
import_exit(1);
}
quicktime_close(p_qt_structure);

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-libvo_video_out_h,v 1.1 2004/06/24 19:29:18 sturm Exp $
--- libvo/video_out.h.orig 2004-05-21 00:43:42.000000000 -0700
+++ libvo/video_out.h 2004-05-21 01:07:47.000000000 -0700
@@ -62,12 +62,12 @@ void vo_accel (uint32_t accel);
/* return NULL terminated array of all drivers */
vo_driver_t * vo_drivers (void);
-static vo_instance_t * vo_open (vo_open_t * open, void (*callback))
+static inline vo_instance_t * vo_open (vo_open_t * open, void (*callback))
{
return open (callback);
}
-static int vo_setup (vo_instance_t * this, int width, int height)
+static inline int vo_setup (vo_instance_t * this, int width, int height)
{
return this->setup (this, width, height);
}

View File

@ -0,0 +1,39 @@
$OpenBSD: patch-libvo_yuv2rgb_mmx_c,v 1.1 2004/06/24 19:29:18 sturm Exp $
--- libvo/yuv2rgb_mmx.c.orig 2003-03-08 05:42:46.000000000 -0800
+++ libvo/yuv2rgb_mmx.c 2004-05-21 00:46:14.000000000 -0700
@@ -49,14 +49,14 @@ do { \
static inline void mmx_yuv2rgb (uint8_t * py, uint8_t * pu, uint8_t * pv)
{
- static mmx_t mmx_80w = {0x0080008000800080};
- static mmx_t mmx_U_green = {0xf37df37df37df37d};
- static mmx_t mmx_U_blue = {0x4093409340934093};
- static mmx_t mmx_V_red = {0x3312331233123312};
- static mmx_t mmx_V_green = {0xe5fce5fce5fce5fc};
- static mmx_t mmx_10w = {0x1010101010101010};
- static mmx_t mmx_00ffw = {0x00ff00ff00ff00ff};
- static mmx_t mmx_Y_coeff = {0x253f253f253f253f};
+ static mmx_t mmx_80w = (mmx_t)(long long)0x0080008000800080LL;
+ static mmx_t mmx_U_green = (mmx_t)(long long)0xf37df37df37df37dLL;
+ static mmx_t mmx_U_blue = (mmx_t)(long long)0x4093409340934093LL;
+ static mmx_t mmx_V_red = (mmx_t)(long long)0x3312331233123312LL;
+ static mmx_t mmx_V_green = (mmx_t)(long long)0xe5fce5fce5fce5fcLL;
+ static mmx_t mmx_10w = (mmx_t)(long long)0x1010101010101010LL;
+ static mmx_t mmx_00ffw = (mmx_t)(long long)0x00ff00ff00ff00ffLL;
+ static mmx_t mmx_Y_coeff = (mmx_t)(long long)0x253f253f253f253fLL;
movd_m2r (*pu, mm0); // mm0 = 00 00 00 00 u3 u2 u1 u0
movd_m2r (*pv, mm1); // mm1 = 00 00 00 00 v3 v2 v1 v0
@@ -125,9 +125,9 @@ static inline void mmx_yuv2rgb (uint8_t
static inline void mmx_unpack_16rgb (uint8_t * image, int cpu)
{
- static mmx_t mmx_bluemask = {0xf8f8f8f8f8f8f8f8};
- static mmx_t mmx_greenmask = {0xfcfcfcfcfcfcfcfc};
- static mmx_t mmx_redmask = {0xf8f8f8f8f8f8f8f8};
+ static mmx_t mmx_bluemask = (mmx_t)(long long)0xf8f8f8f8f8f8f8f8LL;
+ static mmx_t mmx_greenmask = (mmx_t)(long long)0xfcfcfcfcfcfcfcfcLL;
+ static mmx_t mmx_redmask = (mmx_t)(long long)0xf8f8f8f8f8f8f8f8LL;
/*
* convert RGB plane to RGB 16 bits