Start sync with latest libmpeg2 cvs.

include directory first.

CVS patchset: 6299
CVS date: 2004/03/23 01:47:46

1 files changed, 10 insertions, 5 deletions

diff --git a/src/libmpeg2new/include/video_out.h b/src/libmpeg2new/include/video_out.h
index e7f661bbb..342c55197 100644
--- a/src/libmpeg2new/include/video_out.h
+++ b/src/libmpeg2new/include/video_out.h
@@ -21,15 +21,20 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-struct convert_init_s;
+struct mpeg2_sequence_s;
+struct mpeg2_convert_init_s;
 typedef struct {
-    void (* convert) (int, int, uint32_t, void *, struct convert_init_s *);
+    int (* convert) (int stage, void * id,
+		     const struct mpeg2_sequence_s * sequence,
+		     int stride, uint32_t accel, void * arg,
+		     struct mpeg2_convert_init_s * result);
 } vo_setup_result_t;
 
 typedef struct vo_instance_s vo_instance_t;
 struct vo_instance_s {
-    int (* setup) (vo_instance_t * instance, int width, int height,
-		   vo_setup_result_t * result);
+    int (* setup) (vo_instance_t * instance, unsigned int width,
+		   unsigned int height, unsigned int chroma_width,
+		   unsigned int chroma_height, vo_setup_result_t * result);
     void (* setup_fbuf) (vo_instance_t * instance, uint8_t ** buf, void ** id);
     void (* set_fbuf) (vo_instance_t * instance, uint8_t ** buf, void ** id);
     void (* start_fbuf) (vo_instance_t * instance,
@@ -50,4 +55,4 @@ typedef struct {
 void vo_accel (uint32_t accel);
 
 /* return NULL terminated array of all drivers */
-vo_driver_t * vo_drivers (void);
+vo_driver_t const * vo_drivers (void);