Virationnement de quelques warnings.

diff --git a/include/config.h b/include/config.h
index bb50cd45e55806828577e2979cc3d8f4867bbd03..907caeea548f05a3395549836f37f7147a0942b3 100644 (file)
--- a/include/config.h
+++ b/include/config.h
@@ -42,8 +42,8 @@
 #define PROGRAM_OPTIONS         VIDEO_OPTIONS " " ARCH_OPTIONS
 
 /* Program version and copyright message */
-#define PROGRAM_VERSION                "DR 2.1"
-#define COPYRIGHT_MESSAGE      "VideoLAN Client v" PROGRAM_VERSION " (" __DATE__ ") - " PROGRAM_OPTIONS " - (c)1999 VideoLAN\n"
+#define PROGRAM_VERSION                "1.0-dev"
+#define COPYRIGHT_MESSAGE      "VideoLAN Client v" PROGRAM_VERSION " (" __DATE__ ") - " PROGRAM_OPTIONS " - (c)1999-2000 VideoLAN\n"
 
 /*******************************************************************************
  * General compilation options

diff --git a/include/input.h b/include/input.h
index e6f1fa0646c47b73478dab9f23c92ec1bd0028ce..743c27656d97b9ffdb289eb501a60dd2882b0e25 100644 (file)
--- a/include/input.h
+++ b/include/input.h
@@ -303,12 +303,12 @@ typedef struct
  ******************************************************************************/
 
 /* function pointers */
-struct input_thread_struct;
-struct input_cfg_struct;
-typedef int (*f_open_t)( struct input_thread_struct *, struct input_cfg_struct *);
-typedef int (*f_read_t)( struct input_thread_struct *, const struct iovec *,
+struct input_thread_s;
+struct input_cfg_s;
+typedef int (*f_open_t)( struct input_thread_s *, struct input_cfg_s *);
+typedef int (*f_read_t)( struct input_thread_s *, const struct iovec *,
                          size_t );
-typedef void (*f_clean_t)( struct input_thread_struct * );
+typedef void (*f_clean_t)( struct input_thread_s * );
 
 typedef struct input_thread_s
 {

diff --git a/include/vlc.h.new b/include/vlc.h.new
index 5215fef1ba0171eafcd21fb81a1c9b221db90758..09cb3569d07234091419fab4b331e9f3cbd7fdba 100644 (file)
--- a/include/vlc.h.new
+++ b/include/vlc.h.new
@@ -60,6 +60,7 @@
 #include "decoder_fifo.h"
 #include "input_file.h"
 #include "input_network.h"
+#include "input_ctrl.h"
 
 /* Audio */
 #include "audio_output.h"

diff --git a/src/input/input.c.new b/src/input/input.c.new
index 70b287e51e744e3e3f9e7ed4dc076499a9a410b7..b0cbc7b805c8760f0d2e7b20dfa8d0676cd38492 100644 (file)
--- a/src/input/input.c.new
+++ b/src/input/input.c.new
@@ -112,9 +112,9 @@ input_thread_t *input_CreateThread( input_cfg_t *p_cfg )
     {
         /* File methods */
         case INPUT_METHOD_TS_FILE:
-            p_input->p_open = &input_FileCreateMethod;
-            p_input->p_read = &input_FileRead;
-            p_input->p_clean = &input_FileDestroyMethod;
+            p_input->p_open = input_FileCreateMethod;
+            p_input->p_read = input_FileRead;
+            p_input->p_clean = input_FileDestroyMethod;
             break;
 
         /* Network methods */
@@ -122,9 +122,9 @@ input_thread_t *input_CreateThread( input_cfg_t *p_cfg )
         case INPUT_METHOD_TS_MCAST:
         case INPUT_METHOD_TS_BCAST:
         case INPUT_METHOD_TS_VLAN_BCAST:
-            p_input->p_open = &input_NetworkCreateMethod;
-            p_input->p_read = &input_NetworkRead;
-            p_input->p_clean = &input_NetworkDestroyMethod;
+            p_input->p_open = input_NetworkCreateMethod;
+            p_input->p_read = input_NetworkRead;
+            p_input->p_clean = input_NetworkDestroyMethod;
             break;
 
         case INPUT_METHOD_NONE:

diff --git a/src/video_decoder/video_decoder.c b/src/video_decoder/video_decoder.c
index 837b146a594f29008bca34d572c760896d51f16b..1b1db68fc66de683d1de685c41620783101140b9 100644 (file)
--- a/src/video_decoder/video_decoder.c
+++ b/src/video_decoder/video_decoder.c
@@ -325,7 +325,7 @@ void vdec_AddBlock( elem_t * p_block, yuv_data_t * p_data, int i_incr )
  *******************************************************************************/
 void vdec_CopyBlock( elem_t * p_block, yuv_data_t * p_data, int i_incr )
 {
-    int i_x, i_y;
+    int i_y;
     
     for( i_y = 0; i_y < 8; i_y++ )
     {
@@ -335,6 +335,8 @@ void vdec_CopyBlock( elem_t * p_block, yuv_data_t * p_data, int i_incr )
         p_data += i_incr+8;
         p_block += 8;
 #else
+        int i_x;
+
         for( i_x = 0; i_x < 8; i_x++ )
         {
             /* ??? Need clip to be MPEG-2 compliant */