Merge branch '1.0-bugfix'

[vlc] / include / vlc_es.h

diff --git a/include/vlc_es.h b/include/vlc_es.h
index ad19c51350e3e7faf2a4eee4fab6d7ba14a9e78d..c315c5fb92e68f9b1c798f26053a8ccfdd49a37d 100644 (file)
--- a/include/vlc_es.h
+++ b/include/vlc_es.h
@@ -99,9 +99,6 @@ struct audio_format_t
     uint8_t      i_flavor;
 };
 
-#define AUDIO_FMT_S16_NE VLC_CODEC_S16N
-#define AUDIO_FMT_U16_NE VLC_CODEC_U16N
-
 /**
  * video format description
  */
@@ -174,6 +171,12 @@ static inline void video_format_Clean( video_format_t *p_src )
     p_src->p_palette = NULL;
 }
 
+/**
+ * It will fill up a video_format_tvideo_format_t using the given arguments.
+ * Becarefull that the video_format_t must already be initialized.
+ */
+VLC_EXPORT( void, video_format_Setup, ( video_format_t *, vlc_fourcc_t i_chroma, int i_width, int i_height, int i_aspect ) );
+
 /**
  * subtitles format description
  */