X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=include%2Fvlc_common.h;h=451a008926ba35707d652a98a9ddf57a32da7948;hb=refs%2Ftags%2F0.9.0-test1;hp=f4d7de6ec400dc5e130770d7314775055b662b7f;hpb=df4d199617f1d4bcb56c5fe4426fb655a2786949;p=vlc diff --git a/include/vlc_common.h b/include/vlc_common.h index f4d7de6ec4..451a008926 100644 --- a/include/vlc_common.h +++ b/include/vlc_common.h @@ -68,12 +68,6 @@ /* Counter for statistics and profiling */ typedef unsigned long count_t; -/* DCT elements types */ -typedef int16_t dctelem_t; - -/* Video buffer types */ -typedef uint8_t yuv_data_t; - /* Audio volume */ typedef uint16_t audio_volume_t; @@ -221,7 +215,6 @@ typedef struct aout_filter_t aout_filter_t; /* Video */ typedef struct vout_thread_t vout_thread_t; typedef struct vout_sys_t vout_sys_t; -typedef struct chroma_sys_t chroma_sys_t; typedef video_format_t video_frame_format_t; typedef struct picture_t picture_t; @@ -389,7 +382,7 @@ struct stat; typedef union { int i_int; - bool b_bool; + bool b_bool; float f_float; char * psz_string; void * p_address; @@ -447,7 +440,6 @@ struct vlc_list_t #define VLC_ENOMOD -10 /* Module not found */ #define VLC_ENOOBJ -20 /* Object not found */ -#define VLC_EBADOBJ -21 /* Bad object type */ #define VLC_ENOVAR -30 /* Variable not found */ #define VLC_EBADVAR -31 /* Bad variable value */ @@ -521,10 +513,6 @@ typedef struct vlc_object_internals_t vlc_object_internals_t; char *psz_header; \ int i_flags; \ \ - /* Object access lock */ \ - vlc_mutex_t object_lock; \ - vlc_cond_t object_wait; \ - \ /* Object properties */ \ volatile bool b_error; /**< set by the object */ \ volatile bool b_die; /**< set by the outside */ \ @@ -559,7 +547,7 @@ typedef struct vlc_object_internals_t vlc_object_internals_t; struct gc_object_t { - VLC_GC_MEMBERS + VLC_GC_MEMBERS }; static inline void __vlc_gc_incref( gc_object_t * p_gc ) @@ -921,4 +909,10 @@ VLC_EXPORT( const char *, VLC_Changeset, ( void ) ); # define PATH_SEP ":" #endif +#define LICENSE_MSG \ + _("This program comes with NO WARRANTY, to the extent permitted by " \ + "law.\nYou may redistribute it under the terms of the GNU General " \ + "Public License;\nsee the file named COPYING for details.\n" \ + "Written by the VideoLAN team; see the AUTHORS file.\n") + #endif /* !VLC_COMMON_H */