[Mplayer-cvslog] CVS: main xacodec.c,1.22,1.23

[Alex Beregszaszi]

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

Modified Files:
	xacodec.c 
Log Message:
fixed api revision and input fourcc handling (mappings are working too :)

Index: xacodec.c
===================================================================
RCS file: /cvsroot/mplayer/main/xacodec.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xacodec.c	3 Nov 2001 21:57:07 -0000	1.22
+++ xacodec.c	4 Nov 2001 14:21:44 -0000	1.23
@@ -203,6 +203,15 @@
 {
     long codec_ret;
 
+#if 0
+    /* the brute one */
+    if (codec_driver->dec_func)
+    {
+	codec_hdr->decoder = codec_driver->dec_func;
+	mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "We got decoder's address at init! %p\n", codec_hdr->decoder);
+	return(1);
+    }
+#endif
     codec_ret = codec_driver->iq_func(codec_hdr);
     switch(codec_ret)
     {
@@ -251,11 +260,11 @@
 
     codec_hdr.anim_hdr = malloc(4096);
     codec_hdr.description = vidinfo->codec->info;
-    codec_hdr.compression = bswap_32(vidinfo->format);
+    codec_hdr.compression = bswap_32(vidinfo->bih->biCompression);
     codec_hdr.decoder = NULL;
     codec_hdr.avi_ctab_flag = 0;
     codec_hdr.avi_read_ext = NULL;
-    codec_hdr.xapi_rev = 0x0001;
+    codec_hdr.xapi_rev = XAVID_API_REV;
     codec_hdr.extra = NULL;
     codec_hdr.x = vidinfo->disp_w;
     codec_hdr.y = vidinfo->disp_h;