[MPlayer-cvslog] r18771 - trunk/libmpcodecs/vd_divx4.c

[diego]

Author: diego
Date: Wed Jun 21 13:59:07 2006
New Revision: 18771

Modified:
   trunk/libmpcodecs/vd_divx4.c

Log:
Comment #ifdef #endif jungle.


Modified: trunk/libmpcodecs/vd_divx4.c
==============================================================================
--- trunk/libmpcodecs/vd_divx4.c	(original)
+++ trunk/libmpcodecs/vd_divx4.c	Wed Jun 21 13:59:07 2006
@@ -20,15 +20,15 @@
 	"XviD lib (divx4 compat.)",
 #else
 	"DivX4Linux lib",
-#endif
-#endif
+#endif /* #ifdef DECORE_XVID  */
+#endif /* #ifdef DECORE_DIVX5 */
 	"divx4",
 	"A'rpi",
 #ifdef DECORE_XVID
 	"http://www.xvid.com",
 #else
 	"http://www.divx.com",
-#endif
+#endif /* #ifdef DECORE_XVID */
 	"native binary codec"
 };
 
@@ -38,7 +38,7 @@
 #include <divx4.h>
 #else
 #include <decore.h>
-#endif
+#endif /* #ifdef DECORE_XVID */
 
 #define USE_DIVX_BUILTIN_PP
 
@@ -59,7 +59,7 @@
         return 6; // divx4linux >= 5.0.5 -> 0..60
 #else
         return 10; // divx4linux < 5.0.5 -> 0..100
-#endif 
+#endif /* #if DECORE_VERSION >= 20021112 */
     case VDCTRL_SET_PP_LEVEL: {
         int quality=*((int*)arg);
 #if DECORE_VERSION >= 20021112
@@ -73,10 +73,10 @@
 	if(quality<0 || quality>10) quality=10;
 	dec_set.postproc_level=quality*10;
 	decore(0x123,DEC_OPT_SETPP,&dec_set,NULL);
-#endif
+#endif /* #if DECORE_VERSION >= 20021112 */
 	return CONTROL_OK;
     }
-#endif
+#endif /* #ifdef USE_DIVX_BUILTIN_PP */
 #if DECORE_VERSION >= 20011010
     case VDCTRL_SET_EQUALIZER: {
 	va_list ap;
@@ -91,19 +91,19 @@
             option=DEC_ADJ_BRIGHTNESS | DEC_ADJ_SET;
 #else
             option=DEC_GAMMA_BRIGHTNESS;
-#endif
+#endif /* #if DECORE_VERSION >= 20021112 */
         else if(!strcasecmp(arg, "Contrast"))
 #if DECORE_VERSION >= 20021112
             option=DEC_ADJ_CONTRAST | DEC_ADJ_SET;
 #else
             option=DEC_GAMMA_CONTRAST;
-#endif
+#endif /* #if DECORE_VERSION >= 20021112 */
         else if(!strcasecmp(arg,"Saturation"))
 #if DECORE_VERSION >= 20021112
             option=DEC_ADJ_SATURATION | DEC_ADJ_SET;
 #else
             option=DEC_GAMMA_SATURATION;
-#endif
+#endif /* #if DECORE_VERSION >= 20021112 */
         else return CONTROL_FALSE;
 	
         value = (value * 128) / 100;
@@ -111,10 +111,10 @@
         decore(dec_handle, DEC_OPT_ADJUST, &option, &value);
 #else
         decore(0x123, DEC_OPT_GAMMA, (void *)option, (void *) value);
-#endif
+#endif /* #if DECORE_VERSION >= 20021112 */
 	return CONTROL_OK;
     }
-#endif
+#endif /* #if DECORE_VERSION >= 20011010 */
     
     }
 
@@ -205,7 +205,7 @@
 #endif
 
     free(pbi);
-#else // DECORE_VERSION < 20021112
+#else /* DECORE_VERSION >= 20021112 */
     DEC_PARAM dec_param;
     DEC_SET dec_set;
     int bits=16;
@@ -262,7 +262,7 @@
     dec_set.postproc_level = divx_quality;
     decore(0x123, DEC_OPT_SETPP, &dec_set, NULL);
 #endif
-#endif // DECORE_VERSION    
+#endif /* DECORE_VERSION >= 20021112 */
 
     mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: DivX4Linux video codec init OK!\n");
 
@@ -328,5 +328,5 @@
 
     return mpi;
 }
-#endif
-#endif
+#endif /* NEW_DECORE */
+#endif /* USE_DIVX */