Ogg extensions update as RFC 5334 recommends.

[vlc] / include / vlc_es_out.h

diff --git a/include/vlc_es_out.h b/include/vlc_es_out.h
index f86b3b7b9467611007511c99740582f5d4af1cf8..0227131ffa1d631052fc8f7f9db1a4d4d02a9305 100644 (file)
--- a/include/vlc_es_out.h
+++ b/include/vlc_es_out.h
@@ -21,8 +21,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_ES_OUT_H
-#define _VLC_ES_OUT_H 1
+#ifndef VLC_ES_OUT_H
+#define VLC_ES_OUT_H 1
+
+/**
+ * \file
+ * This file defines functions and structures for handling es_out in stream output
+ */
 
 /**
  * \defgroup es out Es Out
@@ -50,6 +55,7 @@ enum es_out_query_e
 
     /* set ES selected for the es category (audio/video/spu) */
     ES_OUT_SET_ES,      /* arg1= es_out_id_t*                   */
+    ES_OUT_RESTART_ES,  /* arg1= es_out_id_t*                   */
 
     /* set 'default' tag on ES (copied across from container) */
     ES_OUT_SET_DEFAULT, /* arg1= es_out_id_t*                   */
@@ -64,7 +70,7 @@ enum es_out_query_e
 
     /* PCR handling, DTS/PTS will be automatically computed using thoses PCR
      * XXX: SET_PCR(_GROUP) are in charge of the pace control. They will wait
-     * to slow down the demuxer to read to the right speed.
+     * to slow down the demuxer so that it reads at the right speed.
      * XXX: if you want PREROLL just call RESET_PCR and
      * ES_OUT_SET_NEXT_DISPLAY_TIME and send data to the decoder *without*
      * calling SET_PCR until preroll is finished.
@@ -101,14 +107,17 @@ struct es_out_t
     es_out_sys_t    *p_sys;
 };
 
+LIBVLC_USED
 static inline es_out_id_t * es_out_Add( es_out_t *out, es_format_t *fmt )
 {
     return out->pf_add( out, fmt );
 }
+
 static inline void es_out_Del( es_out_t *out, es_out_id_t *id )
 {
     out->pf_del( out, id );
 }
+
 static inline int es_out_Send( es_out_t *out, es_out_id_t *id,
                                block_t *p_block )
 {
@@ -119,6 +128,7 @@ static inline int es_out_vaControl( es_out_t *out, int i_query, va_list args )
 {
     return out->pf_control( out, i_query, args );
 }
+
 static inline int es_out_Control( es_out_t *out, int i_query, ... )
 {
     va_list args;