[Mplayer-cvslog] CVS: main xacodec.c,1.2,1.3

Arpi of Ize arpi at mplayer.dev.hu
Mon Oct 22 19:49:28 CEST 2001


Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv12230

Modified Files:
	xacodec.c 
Log Message:
mplayerization

Index: xacodec.c
===================================================================
RCS file: /cvsroot/mplayer/main/xacodec.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xacodec.c	22 Oct 2001 17:07:40 -0000	1.2
+++ xacodec.c	22 Oct 2001 17:49:17 -0000	1.3
@@ -6,21 +6,25 @@
 */
 
 #include <stdio.h>
+#include <stdlib.h>
+
 #include <dlfcn.h> /* dlsym, dlopen, dlclose */
 #include <stdarg.h> /* va_alist, va_start, va_end */
 #include <errno.h> /* strerror, errno */
 
+#include "config.h"
+#define XACODEC_PATH "/usr/lib/xanim"
+
 #include "mp_msg.h"
-#include "aclib/byteswap.h"
+#include "bswap.h"
 
 #include "stream.h"
 #include "demuxer.h"
 #include "codec-cfg.h"
-#include "wine/avifmt.h"
-#include "wine/vfw.h"
-#include "wine/mmreg.h"
 #include "stheader.h"
-#include "loader/DirectShow/default.h"
+
+//#include "loader/DirectShow/default.h"
+
 #include "libvo/img_format.h"
 #include "xacodec.h"
 
@@ -247,7 +251,7 @@
 		vo_format_name(out_format));
 	    return(0);
     }
-    odprintf(LOG_INFO, "xacodec: querying for %dx%d %dbit [fourcc: %4x] (%s)...\n",
+    mp_msg(MSGT_DECVIDEO,MSGL_INFO, "xacodec: querying for %dx%d %dbit [fourcc: %4x] (%s)...\n",
 	codec_hdr.x, codec_hdr.y, codec_hdr.depth, codec_hdr.compression,
 	codec_hdr.description);
 
@@ -275,7 +279,7 @@
 
     if (vidinfo->our_out_buffer == NULL)
     {
-	odprintf(LOG_ERROR, "cannot allocate memory for output: %s",
+	mp_msg(MSGT_DECVIDEO,MSGL_ERR,  "cannot allocate memory for output: %s",
 	    strerror(errno));
 	return(0);
     }




More information about the MPlayer-cvslog mailing list