summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorszabii <szabii@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-04-24 11:30:57 +0000
committerszabii <szabii@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-04-24 11:30:57 +0000
commiteb30258d0725589c3ff770e1d9d67a2905a98a81 (patch)
tree2ea68b10d302b679f4762de7a29cf77c0b956c23 /libvo
parentc2cdf91ec90c6d3ada7a234e75a4efa9035845b7 (diff)
downloadmpv-eb30258d0725589c3ff770e1d9d67a2905a98a81.tar.bz2
mpv-eb30258d0725589c3ff770e1d9d67a2905a98a81.tar.xz
fprintf(stderr converted to printf(
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@615 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/mmx.h32
-rw-r--r--libvo/vo_3dfx.c4
-rw-r--r--libvo/vo_gl.c2
-rw-r--r--libvo/vo_mga.c4
-rw-r--r--libvo/vo_syncfb.c2
-rw-r--r--libvo/vo_x11.c18
-rw-r--r--libvo/vo_xmga.c10
-rw-r--r--libvo/vo_xv.c16
-rw-r--r--libvo/x11_common.c2
-rw-r--r--libvo/yuv2rgb.c10
10 files changed, 50 insertions, 50 deletions
diff --git a/libvo/mmx.h b/libvo/mmx.h
index bc92a7d5db..726e616ede 100644
--- a/libvo/mmx.h
+++ b/libvo/mmx.h
@@ -243,12 +243,12 @@ mmx_ok(void)
{ \
mmx_t mmx_trace; \
mmx_trace.uq = (imm); \
- fprintf(stderr, #op "_i2r(" #imm "=0x%08x%08x, ", \
+ printf(#op "_i2r(" #imm "=0x%08x%08x, ", \
mmx_trace.d[1], mmx_trace.d[0]); \
__asm__ __volatile__ ("movq %%" #reg ", %0" \
: "=X" (mmx_trace) \
: /* nothing */ ); \
- fprintf(stderr, #reg "=0x%08x%08x) => ", \
+ printf(#reg "=0x%08x%08x) => ", \
mmx_trace.d[1], mmx_trace.d[0]); \
__asm__ __volatile__ (#op " %0, %%" #reg \
: /* nothing */ \
@@ -256,7 +256,7 @@ mmx_ok(void)
__asm__ __volatile__ ("movq %%" #reg ", %0" \
: "=X" (mmx_trace) \
: /* nothing */ ); \
- fprintf(stderr, #reg "=0x%08x%08x\n", \
+ printf(#reg "=0x%08x%08x\n", \
mmx_trace.d[1], mmx_trace.d[0]); \
}
@@ -264,12 +264,12 @@ mmx_ok(void)
{ \
mmx_t mmx_trace; \
mmx_trace = (mem); \
- fprintf(stderr, #op "_m2r(" #mem "=0x%08x%08x, ", \
+ printf(#op "_m2r(" #mem "=0x%08x%08x, ", \
mmx_trace.d[1], mmx_trace.d[0]); \
__asm__ __volatile__ ("movq %%" #reg ", %0" \
: "=X" (mmx_trace) \
: /* nothing */ ); \
- fprintf(stderr, #reg "=0x%08x%08x) => ", \
+ printf(#reg "=0x%08x%08x) => ", \
mmx_trace.d[1], mmx_trace.d[0]); \
__asm__ __volatile__ (#op " %0, %%" #reg \
: /* nothing */ \
@@ -277,7 +277,7 @@ mmx_ok(void)
__asm__ __volatile__ ("movq %%" #reg ", %0" \
: "=X" (mmx_trace) \
: /* nothing */ ); \
- fprintf(stderr, #reg "=0x%08x%08x\n", \
+ printf(#reg "=0x%08x%08x\n", \
mmx_trace.d[1], mmx_trace.d[0]); \
}
@@ -287,16 +287,16 @@ mmx_ok(void)
__asm__ __volatile__ ("movq %%" #reg ", %0" \
: "=X" (mmx_trace) \
: /* nothing */ ); \
- fprintf(stderr, #op "_r2m(" #reg "=0x%08x%08x, ", \
+ printf(#op "_r2m(" #reg "=0x%08x%08x, ", \
mmx_trace.d[1], mmx_trace.d[0]); \
mmx_trace = (mem); \
- fprintf(stderr, #mem "=0x%08x%08x) => ", \
+ printf(#mem "=0x%08x%08x) => ", \
mmx_trace.d[1], mmx_trace.d[0]); \
__asm__ __volatile__ (#op " %%" #reg ", %0" \
: "=X" (mem) \
: /* nothing */ ); \
mmx_trace = (mem); \
- fprintf(stderr, #mem "=0x%08x%08x\n", \
+ printf(#mem "=0x%08x%08x\n", \
mmx_trace.d[1], mmx_trace.d[0]); \
}
@@ -306,18 +306,18 @@ mmx_ok(void)
__asm__ __volatile__ ("movq %%" #regs ", %0" \
: "=X" (mmx_trace) \
: /* nothing */ ); \
- fprintf(stderr, #op "_r2r(" #regs "=0x%08x%08x, ", \
+ printf(#op "_r2r(" #regs "=0x%08x%08x, ", \
mmx_trace.d[1], mmx_trace.d[0]); \
__asm__ __volatile__ ("movq %%" #regd ", %0" \
: "=X" (mmx_trace) \
: /* nothing */ ); \
- fprintf(stderr, #regd "=0x%08x%08x) => ", \
+ printf(#regd "=0x%08x%08x) => ", \
mmx_trace.d[1], mmx_trace.d[0]); \
__asm__ __volatile__ (#op " %" #regs ", %" #regd); \
__asm__ __volatile__ ("movq %%" #regd ", %0" \
: "=X" (mmx_trace) \
: /* nothing */ ); \
- fprintf(stderr, #regd "=0x%08x%08x\n", \
+ printf(#regd "=0x%08x%08x\n", \
mmx_trace.d[1], mmx_trace.d[0]); \
}
@@ -325,10 +325,10 @@ mmx_ok(void)
{ \
mmx_t mmx_trace; \
mmx_trace = (mems); \
- fprintf(stderr, #op "_m2m(" #mems "=0x%08x%08x, ", \
+ printf(#op "_m2m(" #mems "=0x%08x%08x, ", \
mmx_trace.d[1], mmx_trace.d[0]); \
mmx_trace = (memd); \
- fprintf(stderr, #memd "=0x%08x%08x) => ", \
+ printf(#memd "=0x%08x%08x) => ", \
mmx_trace.d[1], mmx_trace.d[0]); \
__asm__ __volatile__ ("movq %0, %%mm0\n\t" \
#op " %1, %%mm0\n\t" \
@@ -336,7 +336,7 @@ mmx_ok(void)
: "=X" (memd) \
: "X" (mems)); \
mmx_trace = (memd); \
- fprintf(stderr, #memd "=0x%08x%08x\n", \
+ printf(#memd "=0x%08x%08x\n", \
mmx_trace.d[1], mmx_trace.d[0]); \
}
@@ -692,7 +692,7 @@ mmx_ok(void)
#define emms() \
{ \
- fprintf(stderr, "emms()\n"); \
+ printf("emms()\n"); \
__asm__ __volatile__ ("emms"); \
}
diff --git a/libvo/vo_3dfx.c b/libvo/vo_3dfx.c
index 30f290669e..a0012ee38b 100644
--- a/libvo/vo_3dfx.c
+++ b/libvo/vo_3dfx.c
@@ -170,7 +170,7 @@ create_window(Display *display)
bpp = attribs.depth;
if (bpp != 16)
{
- fprintf(stderr,"Only 16bpp supported!");
+ printf("Only 16bpp supported!");
exit(-1);
}
@@ -336,7 +336,7 @@ init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint3
// Open driver device
if ( (fd = open("/dev/3dfx",O_RDWR) ) == -1)
{
- fprintf(stderr,"Couldn't open /dev/3dfx\n");
+ printf("Couldn't open /dev/3dfx\n");
exit(1);
}
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c
index c16d9addef..cec4c4f2f7 100644
--- a/libvo/vo_gl.c
+++ b/libvo/vo_gl.c
@@ -121,7 +121,7 @@ init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint3
if (mydisplay == NULL)
{
- fprintf(stderr,"Can not open display\n");
+ printf("Can not open display\n");
return -1;
}
diff --git a/libvo/vo_mga.c b/libvo/vo_mga.c
index 4c989282fb..392e397e6f 100644
--- a/libvo/vo_mga.c
+++ b/libvo/vo_mga.c
@@ -59,7 +59,7 @@ init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint3
f = open("/dev/mga_vid",O_RDWR);
if(f == -1)
{
- fprintf(stderr,"Couldn't open /dev/mga_vid\n");
+ printf("Couldn't open /dev/mga_vid\n");
return(-1);
}
@@ -80,7 +80,7 @@ init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint3
mga_vid_config.frame_size = ((width + 31) & ~31) * height * 2;
mga_vid_config.format=MGA_VID_FORMAT_UYVY; break;
default:
- fprintf(stderr,"mga: invalid output format %0X\n",format);
+ printf("mga: invalid output format %0X\n",format);
return (-1);
}
diff --git a/libvo/vo_syncfb.c b/libvo/vo_syncfb.c
index bc7ab55e4d..e01eb3d3f5 100644
--- a/libvo/vo_syncfb.c
+++ b/libvo/vo_syncfb.c
@@ -356,7 +356,7 @@ static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t
f = open("/dev/mga_vid",O_RDWR);
if(f == -1)
{
- fprintf(stderr,"Couldn't open /dev/syncfb or /dev/mga_vid\n");
+ printf("Couldn't open /dev/syncfb or /dev/mga_vid\n");
return(-1);
}
}
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c
index 39cbd2a447..ec23744a69 100644
--- a/libvo/vo_x11.c
+++ b/libvo/vo_x11.c
@@ -138,7 +138,7 @@ static uint32_t init( uint32_t width,uint32_t height,uint32_t d_width,uint32_t d
if ( mDisplay == NULL )
{
- fprintf( stderr,"Can not open display\n" );
+ printf( "Can not open display\n" );
return -1;
}
screen=DefaultScreen( mDisplay );
@@ -245,7 +245,7 @@ static uint32_t init( uint32_t width,uint32_t height,uint32_t d_width,uint32_t d
else
{
Shmem_Flag=0;
- if ( !Quiet_Flag ) fprintf( stderr,"Shared memory not supported\nReverting to normal Xlib\n" );
+ if ( !Quiet_Flag ) printf( "Shared memory not supported\nReverting to normal Xlib\n" );
}
if ( Shmem_Flag ) CompletionType=XShmGetEventBase( mDisplay ) + ShmCompletion;
@@ -257,7 +257,7 @@ static uint32_t init( uint32_t width,uint32_t height,uint32_t d_width,uint32_t d
if ( myximage == NULL )
{
if ( myximage != NULL ) XDestroyImage( myximage );
- if ( !Quiet_Flag ) fprintf( stderr,"Shared memory error,disabling ( Ximage error )\n" );
+ if ( !Quiet_Flag ) printf( "Shared memory error,disabling ( Ximage error )\n" );
goto shmemerror;
}
Shminfo[0].shmid=shmget( IPC_PRIVATE,
@@ -270,7 +270,7 @@ static uint32_t init( uint32_t width,uint32_t height,uint32_t d_width,uint32_t d
{
printf( "%s\n",strerror( errno ) );
perror( strerror( errno ) );
- fprintf( stderr,"Shared memory error,disabling ( seg id error )\n" );
+ printf( "Shared memory error,disabling ( seg id error )\n" );
}
goto shmemerror;
}
@@ -280,7 +280,7 @@ static uint32_t init( uint32_t width,uint32_t height,uint32_t d_width,uint32_t d
{
XDestroyImage( myximage );
if ( Shminfo[0].shmaddr != ( ( char * ) -1 ) ) shmdt( Shminfo[0].shmaddr );
- if ( !Quiet_Flag ) fprintf( stderr,"Shared memory error,disabling ( address error )\n" );
+ if ( !Quiet_Flag ) printf( "Shared memory error,disabling ( address error )\n" );
goto shmemerror;
}
myximage->data=Shminfo[0].shmaddr;
@@ -294,14 +294,14 @@ static uint32_t init( uint32_t width,uint32_t height,uint32_t d_width,uint32_t d
{
XDestroyImage( myximage );
shmdt( Shminfo[0].shmaddr );
- if ( !Quiet_Flag ) fprintf( stderr,"Shared memory error,disabling.\n" );
+ if ( !Quiet_Flag ) printf( "Shared memory error,disabling.\n" );
gXErrorFlag=0;
goto shmemerror;
}
else
shmctl( Shminfo[0].shmid,IPC_RMID,0 );
- if ( !Quiet_Flag ) fprintf( stderr,"Sharing memory.\n" );
+ if ( !Quiet_Flag ) printf( "Sharing memory.\n" );
}
else
{
@@ -319,7 +319,7 @@ static uint32_t init( uint32_t width,uint32_t height,uint32_t d_width,uint32_t d
bpp=myximage->bits_per_pixel;
- fprintf( stderr,"X11 color mask: R:%lX G:%lX B:%lX\n",myximage->red_mask,myximage->green_mask,myximage->blue_mask );
+ printf( "X11 color mask: R:%lX G:%lX B:%lX\n",myximage->red_mask,myximage->green_mask,myximage->blue_mask );
// If we have blue in the lowest bit then obviously RGB
mode=( ( myximage->blue_mask & 0x01 ) != 0 ) ? MODE_RGB : MODE_BGR;
@@ -329,7 +329,7 @@ static uint32_t init( uint32_t width,uint32_t height,uint32_t d_width,uint32_t d
if ( myximage->byte_order != LSBFirst )
#endif
{
- fprintf( stderr,"No support fon non-native XImage byte order!\n" );
+ printf( "No support fon non-native XImage byte order!\n" );
return -1;
}
diff --git a/libvo/vo_xmga.c b/libvo/vo_xmga.c
index c700581754..f008f72cab 100644
--- a/libvo/vo_xmga.c
+++ b/libvo/vo_xmga.c
@@ -133,7 +133,7 @@ static void check_events(void)
set_window();
if ( ioctl( f,MGA_VID_CONFIG,&mga_vid_config ) )
{
- fprintf( stderr,"Error in mga_vid_config ioctl (wrong mga_vid.o version?)" );
+ printf( "Error in mga_vid_config ioctl (wrong mga_vid.o version?)" );
// exit( 0 );
}
@@ -179,7 +179,7 @@ static uint32_t init( uint32_t width, uint32_t height, uint32_t d_width, uint32_
f=open( "/dev/mga_vid",O_RDWR );
if ( f == -1 )
{
- fprintf(stderr,"Couldn't open /dev/mga_vid\n");
+ printf("Couldn't open /dev/mga_vid\n");
return(-1);
}
@@ -205,7 +205,7 @@ static uint32_t init( uint32_t width, uint32_t height, uint32_t d_width, uint32_
mga_vid_config.format=MGA_VID_FORMAT_UYVY;
mga_vid_config.frame_size=( ( width + 31 ) & ~31 ) * height * 2;
break;
- default: fprintf(stderr,"mga: invalid output format %0X\n",format); return (-1);
+ default: printf("mga: invalid output format %0X\n",format); return (-1);
}
if ( X_already_started ) return -1;
@@ -216,7 +216,7 @@ static uint32_t init( uint32_t width, uint32_t height, uint32_t d_width, uint32_
mDisplay=XOpenDisplay(name);
if ( mDisplay == NULL )
{
- fprintf( stderr,"Can not open X11 display\n" );
+ printf( "Can not open X11 display\n" );
return -1;
}
@@ -246,7 +246,7 @@ static uint32_t init( uint32_t width, uint32_t height, uint32_t d_width, uint32_
case 24: fgColor=0x00ff00ffL; break;
case 16: fgColor=0xf81fL; break;
case 15: fgColor=0x7c1fL; break;
- default: fprintf( stderr,"Sorry, this (%d) color depth not supported.\n",vo_depthonscreen ); return -1;
+ default: printf( "Sorry, this (%d) color depth not supported.\n",vo_depthonscreen ); return -1;
}
xWAttribs.background_pixel=0;
xWAttribs.border_pixel=0;
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c
index fd5a37d4a0..58aa6bf5a5 100644
--- a/libvo/vo_xv.c
+++ b/libvo/vo_xv.c
@@ -110,7 +110,7 @@ static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t
if (mydisplay == NULL)
{
- fprintf(stderr,"Can't open display\n");
+ printf("Can't open display\n");
return -1;
}
@@ -155,7 +155,7 @@ static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t
/* check for Xvideo support */
if (Success != XvQueryAdaptors(mydisplay,DefaultRootWindow(mydisplay), &adaptors,&ai))
{
- fprintf(stderr,"Xv: XvQueryAdaptors failed");
+ printf("Xv: XvQueryAdaptors failed");
return -1;
}
/* check adaptors */
@@ -170,7 +170,7 @@ static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t
xv_format=0;
for(i = 0; i < formats; i++)
{
- fprintf(stderr, "Xvideo image format: 0x%x (%4.4s) %s\n", fo[i].id,(char*)&fo[i].id, (fo[i].format == XvPacked) ? "packed" : "planar");
+ printf("Xvideo image format: 0x%x (%4.4s) %s\n", fo[i].id,(char*)&fo[i].id, (fo[i].format == XvPacked) ? "packed" : "planar");
if (fo[i].id == format)
{
@@ -182,14 +182,14 @@ static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t
if (xv_port != 0)
{
- fprintf( stderr,"using Xvideo port %d for hw scaling\n",xv_port );
+ printf( "using Xvideo port %d for hw scaling\n",xv_port );
allocate_xvimage(0);
XGetGeometry( mydisplay,mywindow,&mRoot,&drwX,&drwY,&drwWidth,&drwHeight,&drwBorderWidth,&drwDepth );
drwX=0; drwY=0;
XTranslateCoordinates( mydisplay,mywindow,mRoot,0,0,&drwcX,&drwcY,&mRoot );
- fprintf( stderr,"[xv] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight );
+ printf( "[xv] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight );
if ( mFullscreen )
{
@@ -199,7 +199,7 @@ static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t
drwcY+=drwY;
drwWidth=(dwidth > vo_screenwidth?vo_screenwidth:dwidth);
drwHeight=(dheight > vo_screenheight?vo_screenheight:dheight);
- fprintf( stderr,"[xv-fs] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight );
+ printf( "[xv-fs] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight );
}
saver_off(mydisplay); // turning off screen saver
@@ -243,7 +243,7 @@ static void check_events(void)
XGetGeometry( mydisplay,mywindow,&mRoot,&drwX,&drwY,&drwWidth,&drwHeight,&drwBorderWidth,&drwDepth );
drwX=0; drwY=0;
XTranslateCoordinates( mydisplay,mywindow,mRoot,0,0,&drwcX,&drwcY,&mRoot );
- fprintf( stderr,"[xv] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight );
+ printf( "[xv] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight );
if ( mFullscreen )
{
@@ -253,7 +253,7 @@ static void check_events(void)
drwcY+=drwY;
drwWidth=(dwidth > vo_screenwidth?vo_screenwidth:dwidth);
drwHeight=(dheight > vo_screenheight?vo_screenheight:dheight);
- fprintf( stderr,"[xv-fs] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight );
+ printf( "[xv-fs] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight );
}
}
}
diff --git a/libvo/x11_common.c b/libvo/x11_common.c
index eb538fc943..67b0596d09 100644
--- a/libvo/x11_common.c
+++ b/libvo/x11_common.c
@@ -56,7 +56,7 @@ int vo_init( void )
mDisplay=XOpenDisplay( DisplayName );
if ( !mDisplay )
{
- fprintf( stderr,"vo: couldn't open the X11 display!\n" );
+ printf( "vo: couldn't open the X11 display!\n" );
return 0;
}
mScreen=DefaultScreen( mDisplay ); // Screen ID.
diff --git a/libvo/yuv2rgb.c b/libvo/yuv2rgb.c
index 43e899bf37..7993d09720 100644
--- a/libvo/yuv2rgb.c
+++ b/libvo/yuv2rgb.c
@@ -80,20 +80,20 @@ void yuv2rgb_init (int bpp, int mode)
if (yuv2rgb == NULL /*&& (config.flags & VO_MMX_ENABLE)*/) {
yuv2rgb = yuv2rgb_init_mmx (bpp, mode);
if (yuv2rgb != NULL)
- fprintf (stderr, "Using MMX for colorspace transform\n");
+ printf ("Using MMX for colorspace transform\n");
else
- fprintf (stderr, "Cannot init MMX colorspace transform\n");
+ printf ("Cannot init MMX colorspace transform\n");
}
#endif
#ifdef HAVE_MLIB
if (yuv2rgb == NULL /*&& (config.flags & VO_MLIB_ENABLE)*/) {
yuv2rgb = yuv2rgb_init_mlib (bpp, mode);
if (yuv2rgb != NULL)
- fprintf (stderr, "Using mlib for colorspace transform\n");
+ printf ("Using mlib for colorspace transform\n");
}
#endif
if (yuv2rgb == NULL) {
- fprintf (stderr, "No accelerated colorspace conversion found\n");
+ printf ("No accelerated colorspace conversion found\n");
yuv2rgb_c_init (bpp, mode);
yuv2rgb = (yuv2rgb_fun)yuv2rgb_c;
}
@@ -401,7 +401,7 @@ static void yuv2rgb_c_init (int bpp, int mode)
break;
default:
- fprintf (stderr, "%ibpp not supported by yuv2rgb\n", bpp);
+ printf ("%ibpp not supported by yuv2rgb\n", bpp);
exit (1);
}