* cmml/intf.c: Fix refcount leak on main interface (thanks to gibalou for help)

[vlc] / include / vlc_es_out.h

diff --git a/include/vlc_es_out.h b/include/vlc_es_out.h
index d1970874e6c47f868427bcd546daf8aa588bb5c3..fe1f458c08fc97e98f7bfca15ca213ffb1b92498 100644 (file)
--- a/include/vlc_es_out.h
+++ b/include/vlc_es_out.h
@@ -2,7 +2,7 @@
  * vlc_es_out.h
  *****************************************************************************
  * Copyright (C) 1999-2004 VideoLAN
- * $Id: ninput.h 7930 2004-06-07 18:23:15Z fenrir $
+ * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -33,7 +33,8 @@ enum es_out_mode_e
 {
     ES_OUT_MODE_NONE,   /* don't select anything */
     ES_OUT_MODE_ALL,    /* eg for stream output */
-    ES_OUT_MODE_AUTO    /* best audio/video or for input follow audio-channel, spu-channel */
+    ES_OUT_MODE_AUTO,   /* best audio/video or for input follow audio-channel, spu-channel */
+    ES_OUT_MODE_PARTIAL /* select programs given after --programs */
 };
 
 enum es_out_query_e
@@ -62,6 +63,13 @@ enum es_out_query_e
     ES_OUT_SET_PCR,             /* arg1=int64_t i_pcr(microsecond!) (using default group 0)*/
     ES_OUT_SET_GROUP_PCR,       /* arg1= int i_group, arg2=int64_t i_pcr(microsecond!)*/
     ES_OUT_RESET_PCR,           /* no arg */
+
+    /* Timestamp handling, convert an input timestamp to a global clock one.
+     * (shouldn't have to be used by input plugins directly) */
+    ES_OUT_GET_TS,             /* arg1=int64_t i_ts(microsecond!) (using default group 0), arg2=int64_t* converted i_ts */
+
+    /* Try not to use this one as it is a bit hacky */
+    ES_OUT_SET_FMT      /* arg1= es_out_id_t* arg2=es_format_t* */
 };
 
 struct es_out_t