Commit 8d158ef4 authored by Christophe Massiot's avatar Christophe Massiot
Browse files

Virationnement de quelques warnings.

parent 18a8363d
......@@ -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
......
......@@ -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
{
......
......@@ -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"
......
......@@ -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:
......
......@@ -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 */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment