Commit 2be07191 authored by Sam Hocevar's avatar Sam Hocevar

  * COMPLETE CVS BREAKAGE !! The MAIN branch is going to be a playground
    for my nevrotic and destructive pulsions during the next few hours!

  * If you want to test vlc, please use the v0_2_92_branch branch.

  * Stuff currently working:
     - direct to YUV buffer decoding
     - non-ugly subtitle blending
     - XVideo and SDL video output

  * Stuff currently utterly broken:
     - aspect ratio
     - software rendering (ie, all other video output plugins)

  * Additional misc changes:
     - Renamed spu_dec to spudec and mad_adec to mad to stay coherent with
       other plugins. Also, renamed mpeg to mpeg_system.
     - Added jobi to the AUTHORS file.
     - Factored code common to vout_x11.c and vout_xvideo.c.
parent f2f265d0
......@@ -29,6 +29,11 @@ N: Billy Biggs
E: vektor@dumbterm.net
D: libdvdcss enhancements
N: Johan Bilien
E: jobi@via.ecp.fr
C: jobi
D: VCD input
N: Emmanuel Blindauer
E: manu@agat.net
D: aRts audio output
......
......@@ -16,8 +16,9 @@ endif
PLUGINS_DIR := ac3_adec \
ac3_spdif \
alsa \
arts \
arts \
beos \
chroma \
directx \
dsp \
dummy \
......@@ -34,26 +35,26 @@ PLUGINS_DIR := ac3_adec \
kde \
lpcm_adec \
macosx \
mad_adec \
mad \
memcpy \
mga \
motion \
mpeg \
mpeg_system \
mpeg_adec \
mpeg_vdec \
qt \
sdl \
spu_dec \
spudec \
text \
vcd \
x11 \
yuv
x11
PLUGINS_TARGETS := ac3_adec/ac3_adec \
ac3_spdif/ac3_spdif \
alsa/alsa \
arts/arts \
arts/arts \
beos/beos \
chroma/yuv2rgb8 \
directx/directx \
dsp/dsp \
dummy/dummy \
......@@ -80,7 +81,7 @@ PLUGINS_TARGETS := ac3_adec/ac3_adec \
kde/kde \
lpcm_adec/lpcm_adec \
macosx/macosx \
mad_adec/mad_adec \
mad/mad \
memcpy/memcpy \
memcpy/memcpymmx \
memcpy/memcpymmxext \
......@@ -91,14 +92,14 @@ PLUGINS_TARGETS := ac3_adec/ac3_adec \
motion/motionmmxext \
motion/motion3dnow \
motion/motionaltivec \
mpeg_system/mpeg_es \
mpeg_system/mpeg_ps \
mpeg_system/mpeg_ts \
mpeg_adec/mpeg_adec \
mpeg_vdec/mpeg_vdec \
mpeg/es \
mpeg/ps \
mpeg/ts \
qt/qt \
sdl/sdl \
spu_dec/spu_dec \
spudec/spudec \
text/ncurses \
text/rc \
vcd/vcd \
......@@ -106,12 +107,13 @@ PLUGINS_TARGETS := ac3_adec/ac3_adec \
x11/xvideo \
yuv/yuv \
yuv/yuvmmx
#
# C Objects
#
INTERFACE := main interface intf_msg intf_playlist intf_channels
INPUT := input input_ext-dec input_ext-intf input_dec input_programs input_netlist input_clock mpeg_system
VIDEO_OUTPUT := video_output video_text video_spu video_yuv
VIDEO_OUTPUT := video_output video_text vout_pictures vout_subpictures
AUDIO_OUTPUT := audio_output aout_ext-dec aout_u8 aout_s8 aout_u16 aout_s16 aout_spdif
MISC := mtime tests modules netutils iso_lang
......
......@@ -83,13 +83,13 @@ LIB_GTK = @LIB_GTK@
LIB_KDE = @LIB_KDE@
LIB_LIBDVDCSS = @LIB_LIBDVDCSS@
LIB_MACOSX = @LIB_MACOSX@
LIB_MAD_ADEC = @LIB_MAD_ADEC@
LIB_MAD = @LIB_MAD@
LIB_MPEG_TS = @LIB_MPEG_TS@
LIB_NCURSES = @LIB_NCURSES@
LIB_QNX = @LIB_QNX@
LIB_QT = @LIB_QT@
LIB_RC = @LIB_RC@
LIB_SDL = @LIB_SDL@
LIB_TS = @LIB_TS@
LIB_X11 = @LIB_X11@
LIB_XVIDEO = @LIB_XVIDEO@
LIB_YUV = @LIB_YUV@
......@@ -105,7 +105,7 @@ CFLAGS_ESD = @CFLAGS_ESD@
CFLAGS_LIBDVDCSS = @CFLAGS_LIBDVDCSS@
CFLAGS_ESD = @CFLAGS_ESD@
CFLAGS_GTK = @CFLAGS_GTK@
CFLAGS_MAD_ADEC = @CFLAGS_MAD_ADEC@
CFLAGS_MAD = @CFLAGS_MAD@
CFLAGS_SDL = @CFLAGS_SDL@
CFLAGS_X11 = @CFLAGS_X11@
......
This diff is collapsed.
......@@ -135,6 +135,7 @@ AC_CHECK_FUNC(getopt_long,[AC_DEFINE(HAVE_GETOPT_LONG,1,long getopt support)],
AC_FUNC_MMAP
AC_TYPE_SIGNAL
AC_CHECK_LIB(dl,dlopen,LIB="${LIB} -ldl")
AC_CHECK_LIB(m,cos,LIB_IMDCT="${LIB_IMDCT} -lm")
AC_CHECK_LIB(m,pow,LIB_YUV="${LIB_YUV} -lm")
dnl Check for pthreads - borrowed from XMMS
......@@ -295,13 +296,14 @@ ARCH=${target_cpu}
dnl
dnl default modules
dnl
BUILTINS="${BUILTINS} es ps ts memcpy yuv idct idctclassic motion imdct downmix mpeg_adec lpcm_adec ac3_adec mpeg_vdec"
PLUGINS="${PLUGINS} ac3_spdif spu_dec"
#BUILTINS="${BUILTINS} mpeg_es mpeg_ps mpeg_ts memcpy yuv2rgb8 idct idctclassic motion imdct downmix mpeg_adec lpcm_adec ac3_adec mpeg_vdec"
BUILTINS="${BUILTINS} mpeg_es mpeg_ps mpeg_ts memcpy idct idctclassic motion imdct downmix mpeg_adec lpcm_adec ac3_adec mpeg_vdec"
PLUGINS="${PLUGINS} ac3_spdif spudec"
dnl
dnl Accelerated modules
dnl
MMX_MODULES="memcpymmx yuvmmx idctmmx motionmmx"
MMX_MODULES="memcpymmx idctmmx motionmmx"
MMXEXT_MODULES="memcpymmxext idctmmxext motionmmxext"
THREEDNOW_MODULES="memcpy3dn imdct3dn downmix3dn"
SSE_MODULES="imdctsse downmixsse"
......@@ -407,6 +409,11 @@ case ${target_os} in
*mingw32*)
SYS=mingw32
;;
*nto*)
SYS=nto
LIB_X11="${LIB_X11} -lsocket"
LIB_XVIDEO="${LIB_XVIDEO} -lsocket"
;;
*)
SYS=${target_os}
;;
......@@ -417,7 +424,7 @@ dnl Windoze specific section
dnl
if test $SYS = mingw32; then
AC_CHECK_TOOL(WINDRES, windres, :)
LIB_TS="-lws2_32"
LIB_MPEG_TS="-lws2_32"
LIB_RC="-lws2_32"
fi
......@@ -513,6 +520,22 @@ AC_CHECK_HEADERS(sys/ioctl.h,[
fi
])
dnl
dnl Check the operating system
dnl
case ${target_os} in
bsdi*)
SYS=bsdi
;;
darwin*)
SYS=darwin
;;
*)
SYS=${target_os}
;;
esac
dnl
dnl Special arch tuning
dnl
......@@ -749,28 +772,29 @@ dnl
dnl rc plugin
dnl
AC_ARG_ENABLE(rc,
[ --disable-rc rc module (default enabled)])
[ --disable-rc Remote Control module (default enabled)])
if test x$enable_rc != xno
then
BUILTINS="${BUILTINS} rc"
fi
dnl
dnl libmad plugin
dnl mad plugin
dnl
AC_ARG_WITH(libmad,
[ --with-libmad[=PATH] libmad module (default disabled)],
AC_ARG_WITH(mad,
[ --with-mad[=PATH] libmad module (default disabled)],
[ if test "x$with_val" != "xno"; then
if test -n $with_val; then
CFLAGS_MAD_ADEC="-I$with_val/include"
LIB_MAD_ADEC="-L$with_val/lib -lmad"
CFLAGS_MAD="-I$with_val/include"
LIB_MAD="-L$with_val/lib -lmad"
else
LIB_MAD_ADEC="-lmad"
LIB_MAD="-lmad"
fi
save_CFLAGS=$CFLAGS
save_LDFLAGS=$LDFLAGS
CFLAGS="$CFLAGS $CFLAGS_MAD_ADEC"
LDFLAGS="$LDFLAGS $LIB_MAD_ADEC"
CFLAGS="$CFLAGS $CFLAGS_MAD"
LDFLAGS="$LDFLAGS $LIB_MAD"
AC_CHECK_HEADERS(mad.h, ,
[ echo "Cannot find development headers for libmad..."
exit 1
......@@ -781,7 +805,7 @@ AC_ARG_WITH(libmad,
])
CFLAGS=$save_CFLAGS
LDFLAGS=$save_LDFLAGS
BUILTINS="${BUILTINS} mad_adec"
PLUGINS="${PLUGINS} mad"
fi ])
dnl special case for BeOS
......@@ -1127,7 +1151,7 @@ if test x$enable_x11 != xno &&
saved_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$x_includes"
AC_CHECK_HEADERS(X11/Xlib.h, [
PLUGINS="${PLUGINS} x11"
#PLUGINS="${PLUGINS} x11"
LIB_X11="-L$x_libraries -lX11 -lXext"
CFLAGS_X11="-I$x_includes"
]
......@@ -1234,13 +1258,13 @@ AC_SUBST(LIB_GTK)
AC_SUBST(LIB_KDE)
AC_SUBST(LIB_LIBDVDCSS)
AC_SUBST(LIB_MACOSX)
AC_SUBST(LIB_MAD_ADEC)
AC_SUBST(LIB_MAD)
AC_SUBST(LIB_MPEG_TS)
AC_SUBST(LIB_NCURSES)
AC_SUBST(LIB_QNX)
AC_SUBST(LIB_QT)
AC_SUBST(LIB_RC)
AC_SUBST(LIB_SDL)
AC_SUBST(LIB_TS)
AC_SUBST(LIB_X11)
AC_SUBST(LIB_XVIDEO)
AC_SUBST(LIB_YUV)
......@@ -1253,7 +1277,7 @@ AC_SUBST(CFLAGS_LIBDVDCSS)
AC_SUBST(CFLAGS_ARTS)
AC_SUBST(CFLAGS_ESD)
AC_SUBST(CFLAGS_GTK)
AC_SUBST(CFLAGS_MAD_ADEC)
AC_SUBST(CFLAGS_MAD)
AC_SUBST(CFLAGS_SDL)
AC_SUBST(CFLAGS_X11)
......
......@@ -2,7 +2,7 @@ Source: vlc
Section: graphics
Priority: optional
Maintainer: Samuel Hocevar <sam@zoy.org>
Build-Depends: debhelper (>=2.2.0), xlibs-dev, libgnome-dev, libggi2-dev, libglide2-dev [i386], libesd0-dev, libsdl1.2-dev, libqt-dev, libasound2-dev [alpha i386 ia64 m68k powerpc] (>=0.9.0beta7)
Build-Depends: debhelper (>=2.2.0), xlibs-dev, libgnome-dev, libggi2-dev, libglide2-dev [i386], libesd0-dev, libsdl1.2-dev, libqt-dev, libasound2-dev [alpha i386 ia64 m68k powerpc] (>=0.9.0beta7), libmad0-dev
Standards-Version: 3.0.1
Package: vlc
......@@ -107,3 +107,12 @@ Description: Qt plugin for vlc
VideoLAN is a free MPEG, MPEG2 and DVD software solution.
.
This plugin adds a Qt interface to vlc, the VideoLAN Client.
Package: vlc-mad
Architecture: any
Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
Description: MAD plugin for vlc
VideoLAN is a free MPEG, MPEG2 and DVD software solution.
.
This plugin adds support for libmad, the MPEG audio decoder library, to
the VideoLAN Client. MAD is 100% fixed-point based.
......@@ -9,14 +9,14 @@
export DH_COMPAT=3
# Compilation options
export CONFIG_FLAGS="--enable-release --prefix=/usr --enable-gnome --enable-gtk --enable-fb --with-ggi --enable-sdl --enable-esd --enable-qt"
export CONFIG_FLAGS="--enable-release --prefix=/usr --enable-gnome --enable-gtk --enable-fb --with-ggi --enable-sdl --enable-esd --enable-qt --with-mad"
export LIBDVDCSS_FLAGS="--with-dvdcss=local-shared"
export VIDDIR="usr/share/videolan"
export PIXDIR="usr/share/pixmaps"
export GNOMEDIR="usr/share/gnome/apps/Multimedia"
# Library options
version=$(shell grep '^ *LIBDVDCSS_VERSION=[0-9]' configure.in | head -1 | cut -f2 -d=)
version=$(shell grep '^ *LIBDVDCSS_VERSION=' configure.in | head -1 | sed 's/"//g' | cut -f2 -d=)
major=$(shell echo "$(version)" | cut -f1 -d.)
build: build-stamp
......
......@@ -2,7 +2,7 @@
* css.c: Functions for DVD authentification and unscrambling
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: css.c,v 1.16 2001/11/13 02:03:46 sam Exp $
* $Id: css.c,v 1.17 2001/12/09 17:01:35 sam Exp $
*
* Author: Stphane Borel <stef@via.ecp.fr>
* Hkan Hjort <d95hjort@dtek.chalmers.se>
......@@ -40,7 +40,6 @@
#include <string.h>
#include "config.h"
#include "common.h"
#include "videolan/dvdcss.h"
......
......@@ -2,7 +2,7 @@
* ioctl.c: DVD ioctl replacement function
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: ioctl.c,v 1.14 2001/10/18 23:13:46 ej Exp $
* $Id: ioctl.c,v 1.15 2001/12/09 17:01:35 sam Exp $
*
* Authors: Markus Kuespert <ltlBeBoy@beosmail.com>
* Samuel Hocevar <sam@zoy.org>
......@@ -69,7 +69,6 @@
# include <sys/scsi/impl/uscsi.h>
#endif
#include "config.h"
#include "common.h"
#ifdef SYS_DARWIN
......
......@@ -2,7 +2,7 @@
* libdvdcss.c: DVD reading library.
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: libdvdcss.c,v 1.24 2001/11/27 10:18:33 massiot Exp $
* $Id: libdvdcss.c,v 1.25 2001/12/09 17:01:35 sam Exp $
*
* Authors: Stphane Borel <stef@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -45,7 +45,6 @@
# include <sys/uio.h> /* struct iovec */
#endif
#include "config.h"
#include "common.h"
#if defined( WIN32 )
......
......@@ -3,7 +3,7 @@
* Collection of useful common types and macros definitions
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: common.h,v 1.53 2001/12/07 18:33:07 sam Exp $
* $Id: common.h,v 1.54 2001/12/09 17:01:35 sam Exp $
*
* Authors: Samuel Hocevar <sam@via.ecp.fr>
* Vincent Seguin <seguin@via.ecp.fr>
......@@ -119,10 +119,12 @@ typedef struct intf_channel_s * p_intf_channel_t;
struct input_thread_s;
struct input_channel_s;
struct input_cfg_s;
struct input_area_s;
typedef struct input_thread_s * p_input_thread_t;
typedef struct input_channel_s * p_input_channel_t;
typedef struct input_cfg_s * p_input_cfg_t;
typedef struct input_area_s * p_input_area_t;
/* Audio */
struct aout_thread_s;
......@@ -142,6 +144,7 @@ struct video_parser_s;
typedef struct vout_thread_s * p_vout_thread_t;
typedef struct vout_font_s * p_vout_font_t;
typedef struct vout_sys_s * p_vout_sys_t;
typedef struct chroma_sys_s * p_chroma_sys_t;
typedef struct vdec_thread_s * p_vdec_thread_t;
typedef struct vpar_thread_s * p_vpar_thread_t;
typedef struct video_parser_s * p_video_parser_t;
......@@ -149,6 +152,11 @@ typedef struct video_parser_s * p_video_parser_t;
/* Misc */
struct macroblock_s;
struct data_packet_s;
struct imdct_s;
struct complex_s;
struct dm_par_s;
struct picture_s;
struct picture_sys_s;
struct es_descriptor_s;
struct pgrm_descriptor_s;
struct pes_packet_s;
......@@ -362,11 +370,11 @@ typedef struct module_symbols_s
( int, int, long, long, long, void * );
void ( * aout_DestroyFifo ) ( struct aout_fifo_s * );
struct vout_thread_s * (* vout_CreateThread) ( int *, int, int );
struct vout_thread_s * (* vout_CreateThread) ( int *, int, int, int, int );
struct subpicture_s * (* vout_CreateSubPicture) ( struct vout_thread_s *,
int, int );
struct picture_s * ( * vout_CreatePicture ) ( struct vout_thread_s *,
int, int, int );
int, int, int, int );
void ( * vout_DestroySubPicture ) ( struct vout_thread_s *,
struct subpicture_s * );
......
......@@ -347,6 +347,9 @@
* since higher stream values will result in no display at all. */
#define VOUT_MAX_WIDTH 4096
/* Number of planes in a picture */
#define VOUT_MAX_PLANES 5
/* Video heap size - remember that a decompressed picture is big
* (~1 Mbyte) before using huge values */
#define VOUT_MAX_PICTURES 8
......
......@@ -73,9 +73,6 @@
/* Define if you have the <Ph.h> header file. */
#undef HAVE_PH_H
/* Define if you have the <X11/Xlib.h> header file. */
#undef HAVE_X11_XLIB_H
/* Define if you have the <X11/extensions/Xv.h> header file. */
#undef HAVE_X11_EXTENSIONS_XV_H
......
......@@ -4,7 +4,7 @@
* interface, such as message output.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: interface.h,v 1.22 2001/03/21 13:42:33 sam Exp $
* $Id: interface.h,v 1.23 2001/12/09 17:01:35 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
......@@ -44,21 +44,6 @@
* This structe describes all interface-specific data of the main (interface)
* thread.
*****************************************************************************/
typedef struct _keyparam
{
int key;
int param;
} keyparm;
typedef struct _key
{
int received_key;
keyparm forwarded;
struct _key * next;
} intf_key;
typedef intf_key * p_intf_key;
typedef struct intf_thread_s
{
boolean_t b_die; /* `die' flag */
......@@ -66,7 +51,6 @@ typedef struct intf_thread_s
/* Specific interfaces */
p_intf_console_t p_console; /* console */
p_intf_sys_t p_sys; /* system interface */
p_intf_key p_keys;
/* Plugin used and shortcuts to access its capabilities */
struct module_s * p_module;
......@@ -83,12 +67,9 @@ typedef struct intf_thread_s
/* Channels array - NULL if not used */
p_intf_channel_t p_channel; /* description of channels */
/* Main threads - NULL if not active */
/* Input thread - NULL if not active */
p_input_thread_t p_input;
/* Specific functions */
keyparm (*p_intf_get_key)(struct intf_thread_s *p_intf, int r_key) ;
/* XXX: new message passing stuff will go here */
vlc_mutex_t change_lock;
boolean_t b_menu_change;
......@@ -102,9 +83,3 @@ typedef struct intf_thread_s
intf_thread_t * intf_Create ( void );
void intf_Destroy ( intf_thread_t * p_intf );
int intf_ProcessKey ( intf_thread_t * p_intf, int i_key );
void intf_AssignKey( intf_thread_t *p_intf, int r_key, int f_key, int param);
keyparm intf_GetKey( intf_thread_t *p_intf, int r_key);
void intf_AssignNormalKeys( intf_thread_t *p_intf);
......@@ -2,7 +2,7 @@
* modules.h : Module management functions.
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: modules.h,v 1.35 2001/12/07 18:33:07 sam Exp $
* $Id: modules.h,v 1.36 2001/12/09 17:01:35 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -64,7 +64,7 @@ typedef void * module_handle_t;
#define MODULE_CAPABILITY_IDCT 1 << 6 /* IDCT transformation */
#define MODULE_CAPABILITY_AOUT 1 << 7 /* Audio output */
#define MODULE_CAPABILITY_VOUT 1 << 8 /* Video output */
#define MODULE_CAPABILITY_YUV 1 << 9 /* YUV colorspace conversion */
#define MODULE_CAPABILITY_CHROMA 1 << 9 /* colorspace conversion */
#define MODULE_CAPABILITY_IMDCT 1 << 10 /* IMDCT transformation */
#define MODULE_CAPABILITY_DOWNMIX 1 << 11 /* AC3 downmix */
#define MODULE_CAPABILITY_MEMCPY 1 << 12 /* memcpy */
......@@ -87,6 +87,13 @@ typedef struct probedata_s
{
char * psz_data;
} aout;
struct
{
struct { int i_chroma; int i_width; int i_height; } source;
struct { int i_chroma; int i_width; int i_height; } dest;
} chroma;
} probedata_t;
/* FIXME: find a nicer way to do this. */
......@@ -155,9 +162,10 @@ typedef struct function_list_s
void ( * pf_end ) ( struct vout_thread_s * );
void ( * pf_destroy ) ( struct vout_thread_s * );
int ( * pf_manage ) ( struct vout_thread_s * );
void ( * pf_display ) ( struct vout_thread_s * );
void ( * pf_setpalette ) ( struct vout_thread_s *, u16 *red,
u16 *green, u16 *blue, u16 *transp );
void ( * pf_display ) ( struct vout_thread_s *,
struct picture_s * );
void ( * pf_setpalette ) ( struct vout_thread_s *,
u16 *, u16 *, u16 * );
} vout;
/* Motion compensation plugin */
......@@ -182,13 +190,13 @@ typedef struct function_list_s
void ( * pf_norm_scan ) ( u8 ppi_scan[2][64] );
} idct;
/* YUV transformation plugin */
/* Chroma transformation plugin */
struct
{
int ( * pf_init ) ( struct vout_thread_s * );
int ( * pf_reset ) ( struct vout_thread_s * );
void ( * pf_end ) ( struct vout_thread_s * );
} yuv;
} chroma;
/* IMDCT plugin */
struct
......@@ -247,7 +255,7 @@ typedef struct module_functions_s
function_list_t idct;
function_list_t aout;
function_list_t vout;
function_list_t yuv;
function_list_t chroma;
function_list_t imdct;
function_list_t downmix;
function_list_t memcpy;
......
......@@ -31,8 +31,6 @@
(p_symbols)->TestProgram = TestProgram; \
(p_symbols)->TestMethod = TestMethod; \
(p_symbols)->TestCPU = TestCPU; \
(p_symbols)->intf_AssignKey = intf_AssignKey; \
(p_symbols)->intf_ProcessKey = intf_ProcessKey; \
(p_symbols)->intf_Msg = intf_Msg; \
(p_symbols)->intf_ErrMsg = intf_ErrMsg; \
(p_symbols)->intf_StatMsg = intf_StatMsg;\
......@@ -122,9 +120,6 @@
# define TestMethod(a,b) p_symbols->TestMethod(a,b)
# define TestCPU(a) p_symbols->TestCPU(a)
# define intf_AssignKey(a,b,c,d) p_symbols->intf_AssignKey(a,b,c,d)
# define intf_ProcessKey(a,b) p_symbols->intf_ProcessKey(a,b)
# define intf_Msg p_symbols->intf_Msg
# define intf_ErrMsg p_symbols->intf_ErrMsg
# define intf_StatMsg p_symbols->intf_StatMsg
......
......@@ -2,7 +2,7 @@
* vdec_ext-plugins.h : structures from the video decoder exported to plug-ins
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: vdec_ext-plugins.h,v 1.7 2001/10/11 16:12:43 massiot Exp $
* $Id: vdec_ext-plugins.h,v 1.8 2001/12/09 17:01:35 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -63,7 +63,8 @@ typedef struct macroblock_s
/* Motion compensation information */
motion_inner_t p_motions[8];
int i_nb_motions;
yuv_data_t * pp_dest[3];
pixel_data_t * pp_dest[3];
} macroblock_t;
/* Macroblock Modes */
......
......@@ -4,7 +4,7 @@
* includes all common video types and constants.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: video.h,v 1.32 2001/08/22 17:21:45 massiot Exp $
* $Id: video.h,v 1.33 2001/12/09 17:01:35 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
......@@ -30,6 +30,17 @@
* "mtime.h"
*****************************************************