[MPlayer-cvslog] r22830 - trunk/xvmc_render.h

[iive]

Author: iive
Date: Mon Mar 26 17:23:15 2007
New Revision: 22830

Modified:
   trunk/xvmc_render.h

Log:
sync to lavcodecs version


Modified: trunk/xvmc_render.h
==============================================================================
--- trunk/xvmc_render.h	(original)
+++ trunk/xvmc_render.h	Mon Mar 26 17:23:15 2007
@@ -27,8 +27,6 @@ typedef   struct{
   int idct;//does we use IDCT acceleration?
   int chroma_format;//420,422,444
   int unsigned_intra;//+-128 for intra pictures after clip
-  int reserved1[12];//future extenstions (e.g. gmc,qpel)
-  void * p_osd_target_surface_render;//pointer to the surface where subpicture is rendered
   XvMCSurface* p_surface;//pointer to rendered surface, never changed
 
 //these are changed by decoder
@@ -38,13 +36,15 @@ typedef   struct{
 
   unsigned int picture_structure;//top/bottom fields or frame  !
   unsigned int flags;//XVMC_SECOND_FIELD - 1'st or 2'd field in the sequence
-  unsigned int display_flags; //1,2 or 1+2 fields for XvMCPutSurface, 
+  unsigned int display_flags; //1,2 or 1+2 fields for XvMCPutSurface,
 
 //these are internal communication one
   int state;//0-free,1 Waiting to Display,2 Waiting for prediction
   int start_mv_blocks_num;//offset in the array for the current slice,updated by vo
   int filled_mv_blocks_num;//processed mv block in this slice,change by decoder
-  
+
   int next_free_data_block_num;//used in add_mv_block, pointer to next free block
+//extensions
+  void * p_osd_target_surface_render;//pointer to the surface where subpicture is rendered
 
 } xvmc_render_state_t;