* modules/packetizer/mpegvideo.c: Correctly flag the picture types in

[vlc] / include / vlc_video.h

diff --git a/include/vlc_video.h b/include/vlc_video.h
index 66b3564f1c20aff3b5bf7a3005756cb12154f8a2..ef1ef3f286d268b68a9ec4d691d929982387cdb0 100644 (file)
--- a/include/vlc_video.h
+++ b/include/vlc_video.h
@@ -4,7 +4,7 @@
  * includes all common video types and constants.
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: vlc_video.h,v 1.5 2003/10/24 21:27:06 gbazin Exp $
+ * $Id: vlc_video.h,v 1.9 2004/01/25 18:17:08 zorglub Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -12,7 +12,7 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -25,24 +25,7 @@
 #ifndef _VLC_VIDEO_H
 #define _VLC_VIDEO_H 1
 
-/**
- * Description of a video frame
- */
-struct video_frame_format_t
-{
-    vlc_fourcc_t i_chroma;                               /**< picture chroma */
-    unsigned int i_aspect;                                 /**< aspect ratio */
-
-    unsigned int i_width;                                 /**< picture width */
-    unsigned int i_height;                               /**< picture height */
-    unsigned int i_x_offset;               /**< start offset of visible area */
-    unsigned int i_y_offset;               /**< start offset of visible area */
-    unsigned int i_visible_width;                 /**< width of visible area */
-    unsigned int i_visible_height;               /**< height of visible area */
-
-    unsigned int i_bits_per_pixel;             /**< number of bits per pixel */
-
-};
+#include "vlc_es.h"
 
 /**
  * Description of a planar graphic field
@@ -112,7 +95,7 @@ struct picture_t
     unsigned int    i_nb_fields;                  /**< # of displayed fields */
     vlc_bool_t      b_top_field_first;             /**< which field is first */
     /**@}*/
-    
+
     /** The picture heap we are attached to */
     picture_heap_t* p_heap;
 
@@ -257,6 +240,19 @@ struct subpicture_t
 #define RESERVED_SUBPICTURE    1                   /* allocated and reserved */
 #define READY_SUBPICTURE       2                        /* ready for display */
 
+/*****************************************************************************
+ * Prototypes
+ *****************************************************************************/
+/**
+ * vout_AspectRatio
+ *
+ * Set the i_aspect_x and i_aspect_y from the encoded aspect ratio i_aspect.
+ * \param i_aspect the encoded aspect ratio
+ * \param i_aspect_x the decoded x-axis portion of i_aspect. This is set.
+ * \param i_aspect_y the decoded y-axis portion of i_aspect  This is set.
+ */
+VLC_EXPORT( void,  vout_AspectRatio, ( unsigned int i_aspect, unsigned int *i_aspect_x, unsigned int *i_aspect_y ) );
+
 /**@}*/
 
 #endif /* _VLC_VIDEO_H */