#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
******************************************************************************/
/* 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
{
#include "decoder_fifo.h"
#include "input_file.h"
#include "input_network.h"
+#include "input_ctrl.h"
/* Audio */
#include "audio_output.h"
{
/* 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 */
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:
*******************************************************************************/
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++ )
{
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 */