[Mplayer-cvslog] CVS: main/libmpcodecs vd_odivx.c,1.8,1.9 vd_divx4.c,1.7,1.8

[Atmosfear]

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

Modified Files:
	vd_odivx.c vd_divx4.c 
Log Message:
Im proved Build Version selection for DivX 5.


Index: vd_odivx.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_odivx.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- vd_odivx.c	18 Mar 2002 01:48:22 -0000	1.8
+++ vd_odivx.c	21 Mar 2002 18:59:07 -0000	1.9
@@ -120,7 +120,17 @@
     dec_param.color_depth = 32;
 #endif
 #ifdef DECORE_DIVX5
-    dec_param.codec_version = (sh->format==mmioFOURCC('D','I','V','3'))?311:500;
+    switch(sh->format) {
+      case mmioFOURCC('D','I','V','3'):
+       	dec_param.codec_version = 311;
+	break;
+      case mmioFOURCC('D','I','V','X'):
+       	dec_param.codec_version = 400;
+	break;
+      case mmioFOURCC('D','X','5','0'):
+      default: // Fallback to DivX 5 behaviour
+       	dec_param.codec_version = 500;
+    }
     dec_param.build_number = 0;
 #endif
     dec_param.x_dim = sh->disp_w;

Index: vd_divx4.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_divx4.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vd_divx4.c	18 Mar 2002 00:46:44 -0000	1.7
+++ vd_divx4.c	21 Mar 2002 18:59:07 -0000	1.8
@@ -106,7 +106,17 @@
 	  return 0;
     }
 #ifdef DECORE_DIVX5
-    dec_param.codec_version = (sh->format==mmioFOURCC('D','I','V','3'))?311:500;
+    switch(sh->format) {
+      case mmioFOURCC('D','I','V','3'):
+       	dec_param.codec_version = 311;
+	break;
+      case mmioFOURCC('D','I','V','X'):
+       	dec_param.codec_version = 400;
+	break;
+      case mmioFOURCC('D','X','5','0'):
+      default: // Fallback to DivX 5 behaviour
+       	dec_param.codec_version = 500;
+    }
     dec_param.build_number = 0;
 #endif
     dec_param.x_dim = sh->disp_w;