X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_es.h;h=d020d134ac7442f0568b5a67edc70b2220190c6e;hb=10a6bde56813620846826fed6979b2548a6457ea;hp=2ed79c606f3e14ecdad15fb8e26bfad60f293a6b;hpb=aa4867fe618b00ce03307e930a95154228f7de59;p=vlc

diff --git a/include/vlc_es.h b/include/vlc_es.h
index 2ed79c606f..d020d134ac 100644
--- a/include/vlc_es.h
+++ b/include/vlc_es.h
@@ -21,13 +21,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#if !defined( __LIBVLC__ )
-  #error You are not libvlc or one of its plugins. You cannot include this file
-#endif
-
 #ifndef _VLC_ES_H
 #define _VLC_ES_H 1
 
+/* FIXME: i'm not too sure about this include but it fixes compilation of
+ * video chromas -- dionoea */
+#include "vlc_common.h"
+
 /**
  * \file
  * This file defines the elementary streams format types
@@ -53,12 +53,12 @@ struct video_palette_t
 typedef struct
 {
     /* true if we have the peak value */
-    vlc_bool_t pb_peak[AUDIO_REPLAY_GAIN_MAX];
+    bool pb_peak[AUDIO_REPLAY_GAIN_MAX];
     /* peak value where 1.0 means full sample value */
     float      pf_peak[AUDIO_REPLAY_GAIN_MAX];
 
     /* true if we have the gain value */
-    vlc_bool_t pb_gain[AUDIO_REPLAY_GAIN_MAX];
+    bool pb_gain[AUDIO_REPLAY_GAIN_MAX];
     /* gain value in dB */
     float      pf_gain[AUDIO_REPLAY_GAIN_MAX];
 } audio_replay_gain_t;
@@ -130,6 +130,9 @@ struct video_format_t
     unsigned int i_frame_rate_base;              /**< frame rate denominator */
 
     int i_rmask, i_gmask, i_bmask;          /**< color masks for RGB chroma */
+    int i_rrshift, i_lrshift;
+    int i_rgshift, i_lgshift;
+    int i_rbshift, i_lbshift;
     video_palette_t *p_palette;              /**< video palette from demuxer */
 };
 
@@ -200,7 +203,7 @@ struct es_format_t
 
     unsigned int   i_bitrate;
 
-    vlc_bool_t     b_packetized; /* wether the data is packetized
+    bool     b_packetized; /* wether the data is packetized
                                     (ie. not truncated) */
     int     i_extra;
     void    *p_extra;
@@ -233,7 +236,7 @@ static inline void es_format_Init( es_format_t *fmt,
     memset( &fmt->video, 0, sizeof(video_format_t) );
     memset( &fmt->subs, 0, sizeof(subs_format_t) );
 
-    fmt->b_packetized           = VLC_TRUE;
+    fmt->b_packetized           = true;
     fmt->i_bitrate              = 0;
     fmt->i_extra                = 0;
     fmt->p_extra                = NULL;