[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[309] mplayerxp

[<nic...@us...>]

Revision: 309
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=309&view=rev
Author:   nickols_k
Date:     2012-11-09 08:44:54 +0000 (Fri, 09 Nov 2012)
Log Message:
-----------
cleanups

Modified Paths:
--------------
    mplayerxp/libmpcodecs/ad.h
    mplayerxp/libmpcodecs/ad_internal.h
    mplayerxp/libmpcodecs/ad_libdv.c
    mplayerxp/libmpcodecs/vd.h
    mplayerxp/libmpcodecs/vd_internal.h
    mplayerxp/libmpcodecs/vd_libdv.c
    mplayerxp/mplayerxp.c
    mplayerxp/xmpcore/xmp_enums.h

Modified: mplayerxp/libmpcodecs/ad.h
===================================================================
--- mplayerxp/libmpcodecs/ad.h	2012-11-09 08:17:43 UTC (rev 308)
+++ mplayerxp/libmpcodecs/ad.h	2012-11-09 08:44:54 UTC (rev 309)
@@ -28,7 +28,7 @@
     int (* __FASTCALL__ preinit)(sh_audio_t *);
     int (* __FASTCALL__ init)(sh_audio_t *sh);
     void (* __FASTCALL__ uninit)(sh_audio_t *sh);
-    MPXP_Rc (* __FASTCALL__ control)(sh_audio_t *sh,int cmd,any_t* arg, ...);
+    MPXP_Rc (* control)(sh_audio_t *sh,int cmd,any_t* arg, ...);
     unsigned (* __FASTCALL__ decode)(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts);
 } ad_functions_t;
 

Modified: mplayerxp/libmpcodecs/ad_internal.h
===================================================================
--- mplayerxp/libmpcodecs/ad_internal.h	2012-11-09 08:17:43 UTC (rev 308)
+++ mplayerxp/libmpcodecs/ad_internal.h	2012-11-09 08:44:54 UTC (rev 309)
@@ -12,11 +12,10 @@
 
 #include "ad_msg.h"
 
-static const config_t options[];
 static int __FASTCALL__ init(sh_audio_t *sh);
 static int __FASTCALL__  preinit(sh_audio_t *sh);
 static void __FASTCALL__  uninit(sh_audio_t *sh);
-static MPXP_Rc __FASTCALL__  control(sh_audio_t *sh,int cmd,any_t* arg, ...);
+static MPXP_Rc control(sh_audio_t *sh,int cmd,any_t* arg, ...);
 static unsigned __FASTCALL__  decode(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts);
 
 #define LIBAD_EXTERN(x) const ad_functions_t mpcodecs_ad_##x = {\

Modified: mplayerxp/libmpcodecs/ad_libdv.c
===================================================================
--- mplayerxp/libmpcodecs/ad_libdv.c	2012-11-09 08:17:43 UTC (rev 308)
+++ mplayerxp/libmpcodecs/ad_libdv.c	2012-11-09 08:44:54 UTC (rev 309)
@@ -19,7 +19,7 @@
 
 #include "ad_internal.h"
 
-static ad_info_t info =
+static const ad_info_t info =
 {
 	"Raw DV Audio Decoder",
 	"libdv",

Modified: mplayerxp/libmpcodecs/vd.h
===================================================================
--- mplayerxp/libmpcodecs/vd.h	2012-11-09 08:17:43 UTC (rev 308)
+++ mplayerxp/libmpcodecs/vd.h	2012-11-09 08:44:54 UTC (rev 309)
@@ -19,7 +19,7 @@
     const config_t*  options;/**< Optional: MPlayerXP's option related */
     int (*__FASTCALL__ init)(sh_video_t *sh);
     void (*__FASTCALL__ uninit)(sh_video_t *sh);
-    MPXP_Rc (*__FASTCALL__ control)(sh_video_t *sh,int cmd,any_t* arg, ...);
+    MPXP_Rc (* control)(sh_video_t *sh,int cmd,any_t* arg, ...);
     mp_image_t* (*__FASTCALL__ decode)(sh_video_t *sh,any_t* data,int len,int flags);
 } vd_functions_t;
 

Modified: mplayerxp/libmpcodecs/vd_internal.h
===================================================================
--- mplayerxp/libmpcodecs/vd_internal.h	2012-11-09 08:17:43 UTC (rev 308)
+++ mplayerxp/libmpcodecs/vd_internal.h	2012-11-09 08:44:54 UTC (rev 309)
@@ -14,7 +14,7 @@
 // prototypes:
 //static vd_info_t info;
 static const config_t options[];
-static MPXP_Rc __FASTCALL__ control(sh_video_t *sh,int cmd,any_t* arg,...);
+static MPXP_Rc control(sh_video_t *sh,int cmd,any_t* arg,...);
 static int __FASTCALL__ init(sh_video_t *sh);
 static void __FASTCALL__ uninit(sh_video_t *sh);
 static mp_image_t* __FASTCALL__ decode(sh_video_t *sh,any_t* data,int len,int flags);

Modified: mplayerxp/libmpcodecs/vd_libdv.c
===================================================================
--- mplayerxp/libmpcodecs/vd_libdv.c	2012-11-09 08:17:43 UTC (rev 308)
+++ mplayerxp/libmpcodecs/vd_libdv.c	2012-11-09 08:44:54 UTC (rev 309)
@@ -18,7 +18,7 @@
 
 #include "vd_internal.h"
 
-static vd_info_t info =
+static const vd_info_t info =
 {
 	"Raw DV Video Decoder",
 	"libdv",

Modified: mplayerxp/mplayerxp.c
===================================================================
--- mplayerxp/mplayerxp.c	2012-11-09 08:17:43 UTC (rev 308)
+++ mplayerxp/mplayerxp.c	2012-11-09 08:44:54 UTC (rev 309)
@@ -183,7 +183,7 @@
 static MPXP_Rc mpxp_test_antiviral_protection(int* verbose)
 {
     if(*verbose) MSG_INFO("Your've specified test-av option!\nRight now MPlayerXP should make coredump!\n");
-    *verbose=antiviral_hole1[0]|antiviral_hole2[0]|antiviral_hole2[0];
+    *verbose=antiviral_hole1[0]|antiviral_hole2[0]|antiviral_hole3[0];
     MSG_ERR("Antiviral protection of MPlayerXP doesn't work!");
     return MPXP_Virus;
 }

Modified: mplayerxp/xmpcore/xmp_enums.h
===================================================================
--- mplayerxp/xmpcore/xmp_enums.h	2012-11-09 08:17:43 UTC (rev 308)
+++ mplayerxp/xmpcore/xmp_enums.h	2012-11-09 08:44:54 UTC (rev 309)
@@ -6,10 +6,10 @@
     MPXP_True	=1,
     MPXP_Ok	=MPXP_True,
     MPXP_False	=0,
-    MPXP_Virus	=MPXP_False,
     MPXP_Unknown=-1,
     MPXP_Error	=-2,
-    MPXP_NA	=-3
+    MPXP_NA	=-3,
+    MPXP_Virus	=-4
 }MPXP_Rc;
 
 #endif

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.