XvMC: revert [25318] and do it in a better way. Remove some warnings because of forgo...

diff --git a/modules/codec/xvmc/alloc.c b/modules/codec/xvmc/alloc.c
index b7a52d0ba536a4d1b341f60bb847f2c4185abbea..231caccd7427d271d58125875551ba3b6aef9584 100644 (file)
--- a/modules/codec/xvmc/alloc.c
+++ b/modules/codec/xvmc/alloc.c
@@ -23,6 +23,7 @@
 
 #include <stddef.h>
 #include <inttypes.h>
+#include <stdlib.h>
 
 #include "mpeg2.h"
 

diff --git a/modules/codec/xvmc/cpu_state.c b/modules/codec/xvmc/cpu_state.c
index b38301f04be9d0cf23616a0a7bf18c7be95aa16f..655027f7526ab733814ae7a3f5dee56a02fa4c3a 100644 (file)
--- a/modules/codec/xvmc/cpu_state.c
+++ b/modules/codec/xvmc/cpu_state.c
@@ -23,6 +23,7 @@
 
 #include "xxmc-config.h"
 
+#include <stddef.h>
 #include <inttypes.h>
 
 #include "mpeg2.h"
@@ -33,8 +34,8 @@
 # include "mmx.h"
 #endif
 
-void (* mpeg2_cpu_state_save) (cpu_state_t * state) = 0;
-void (* mpeg2_cpu_state_restore) (cpu_state_t * state) = 0;
+void (* mpeg2_cpu_state_save) (cpu_state_t * state) = NULL;
+void (* mpeg2_cpu_state_restore) (cpu_state_t * state) = NULL;
 
 static void state_restore_mmx (cpu_state_t * state)
 {

diff --git a/modules/codec/xvmc/xxmc-config.h b/modules/codec/xvmc/xxmc-config.h
index e9e3cc7e170490724ef5b8c0260b2b9a6b2b6311..cdeb669c6d459b98bfe40fe8feac70ae7c52dd61 100644 (file)
--- a/modules/codec/xvmc/xxmc-config.h
+++ b/modules/codec/xvmc/xxmc-config.h
@@ -95,22 +95,22 @@
 /* #undef MPEG2DEC_GPROF */
 
 /* Name of package */
-#define PACKAGE "mpeg2dec"
+/*#define PACKAGE "mpeg2dec"*/
 
 /* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
+/*#define PACKAGE_BUGREPORT ""*/
 
 /* Define to the full name of this package. */
-#define PACKAGE_NAME ""
+/*#define PACKAGE_NAME ""*/
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING ""
+/*#define PACKAGE_STRING ""*/
 
 /* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME ""
+/*#define PACKAGE_TARNAME ""*/
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION ""
+/*#define PACKAGE_VERSION ""*/
 
 /* Define as the return type of signal handlers (`int' or `void'). */
 #define RETSIGTYPE void