Allow the <width>x<height>+<left>+<top> syntax in video output core cropping

[vlc] / include / vlc_demux.h

diff --git a/include/vlc_demux.h b/include/vlc_demux.h
index 2eefcb8cf855c78b707760e3a4eb406827552711..52bfccacc2974a5d6cf9ea532b4517e8476afd9a 100644 (file)
--- a/include/vlc_demux.h
+++ b/include/vlc_demux.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
- * vlc_demux.h
+ * vlc_demux.h: Demuxer descriptor, queries and methods
  *****************************************************************************
- * Copyright (C) 1999-2004 VideoLAN
+ * Copyright (C) 1999-2005 the VideoLAN team
  * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef _VLC_DEMUX_H
@@ -45,7 +45,7 @@ struct demux_t
     stream_t    *s;     /* NULL in case of a access+demux in one */
 
     /* es output */
-    es_out_t    *out;   /* ou p_es_out */
+    es_out_t    *out;   /* our p_es_out */
 
     /* set by demuxer */
     int (*pf_demux)  ( demux_t * );   /* demux one frame only */
@@ -82,7 +82,6 @@ enum demux_query_e
     /* TITLE/SEEKPOINT, only when TITLE_INFO succeed */
     DEMUX_SET_TITLE,            /* arg1= int            can fail */
     DEMUX_SET_SEEKPOINT,        /* arg1= int            can fail */
-    DEMUX_GET_SEEKPOINT_TIME,   /* arg1= int arg2 = mtime_t *  res = can fail   */
 
     /* DEMUX_SET_GROUP only a hit for demuxer (mainly DVB) to allow not
      * reading everything (you should not use this to call es_out_Control)
@@ -106,7 +105,7 @@ enum demux_query_e
     DEMUX_CAN_PAUSE,            /* arg1= vlc_bool_t*    cannot fail */
     DEMUX_CAN_CONTROL_PACE,     /* arg1= vlc_bool_t*    cannot fail */
     DEMUX_GET_PTS_DELAY,        /* arg1= int64_t*       cannot fail */
-    DEMUX_SET_PAUSE_STATE, /* arg1= vlc_bool_t     can fail */
+    DEMUX_SET_PAUSE_STATE       /* arg1= vlc_bool_t     can fail */
 };
 
 /* stream_t *s could be null and then it mean a access+demux in one */