[Mplayer-cvslog] CVS: main/libmpcodecs vd_odivx.c,1.5,1.6 vd_divx4.c,1.4,1.5

[Arpi of Ize]

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

Modified Files:
	vd_odivx.c vd_divx4.c 
Log Message:
hopefully fixed divx5 header + xvid conflict

Index: vd_odivx.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_odivx.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vd_odivx.c	10 Mar 2002 01:38:21 -0000	1.5
+++ vd_odivx.c	11 Mar 2002 00:39:40 -0000	1.6
@@ -146,7 +146,7 @@
 #ifdef NEW_DECORE
     dec_frame.bmp=&dec_pic;
     dec_pic.y=dec_pic.u=dec_pic.v=NULL;
-#ifdef DECORE_DIVX5
+#ifndef DEC_OPT_FRAME_311
     decore(0x123, DEC_OPT_FRAME, &dec_frame, NULL);
 #else
     decore(0x123, (sh->format==mmioFOURCC('D','I','V','3'))?DEC_OPT_FRAME_311:DEC_OPT_FRAME, &dec_frame, NULL);

Index: vd_divx4.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_divx4.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vd_divx4.c	9 Mar 2002 19:18:46 -0000	1.4
+++ vd_divx4.c	11 Mar 2002 00:39:40 -0000	1.5
@@ -132,7 +132,7 @@
     dec_frame.bmp=mpi->planes[0];
     dec_frame.stride=mpi->width;
     
-#ifdef DECORE_DIVX5
+#ifndef DEC_OPT_FRAME_311
     decore(0x123, DEC_OPT_FRAME, &dec_frame, NULL);
 #else
     decore(0x123, (sh->format==mmioFOURCC('D','I','V','3'))?DEC_OPT_FRAME_311:DEC_OPT_FRAME, &dec_frame, NULL);