block: rewrite block_Fifo(Empty,Get,Put) with the new functions

[vlc] / include / vlc_es.h

diff --git a/include/vlc_es.h b/include/vlc_es.h
index 5790d2343b22322d1f5e4965697dbc3d5a0e378c..ff31b63faed30fec2c3dc2f5800dcae2f5f66225 100644 (file)
--- a/include/vlc_es.h
+++ b/include/vlc_es.h
@@ -213,7 +213,7 @@ struct video_format_t
     unsigned int i_frame_rate;                     /**< frame rate numerator */
     unsigned int i_frame_rate_base;              /**< frame rate denominator */
 
-    uint32_t i_rmask, i_gmask, i_bmask;          /**< color masks for RGB chroma */
+    uint32_t 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;
@@ -285,7 +285,8 @@ VLC_API void video_format_ScaleCropAr( video_format_t *, const video_format_t *
  * This function "normalizes" the formats orientation, by switching the a/r according to the orientation,
  * producing a format whose orientation is ORIENT_NORMAL. It makes a shallow copy (pallette is not alloc'ed).
  */
-VLC_API void video_format_ApplyRotation(video_format_t *restrict out, const video_format_t *restrict in);
+VLC_API void video_format_ApplyRotation(video_format_t * /*restrict*/ out,
+                                        const video_format_t *in);
 
 /**
  * This function applies the transform operation to fmt.
@@ -400,7 +401,7 @@ struct es_format_t
 
     char            *psz_language;        /**< human readible language name */
     char            *psz_description;     /**< human readible description of language */
-    int             i_extra_languages;    /**< length in bytes of extra language data pointer */
+    unsigned        i_extra_languages;    /**< length in bytes of extra language data pointer */
     extra_languages_t *p_extra_languages; /**< extra language data needed by some decoders */
 
     audio_format_t  audio;    /**< description of audio format */