diff options
author | Diego Biurrun <diego@biurrun.de> | 2009-02-14 18:15:59 +0000 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2009-02-14 18:15:59 +0000 |
commit | c1a5aa2953ed30c7aa1097b3f6419e3e6225e88d (patch) | |
tree | 2dd7bf4aa558e276ae8ff2e8fb4a7cee7e4742ba /libavcodec/xvmc.h | |
parent | aae667ba4d2fbea437520f2f481e733ebead4464 (diff) | |
download | ffmpeg-c1a5aa2953ed30c7aa1097b3f6419e3e6225e88d.tar.gz |
whitespace cosmetics: Restore vertical alignment.
Originally committed as revision 17253 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/xvmc.h')
-rw-r--r-- | libavcodec/xvmc.h | 46 |
1 files changed, 21 insertions, 25 deletions
diff --git a/libavcodec/xvmc.h b/libavcodec/xvmc.h index b14c31d112..97efa82183 100644 --- a/libavcodec/xvmc.h +++ b/libavcodec/xvmc.h @@ -25,15 +25,11 @@ #include "avcodec.h" -/**the surface should be shown, the video driver manipulates this*/ -#define AV_XVMC_STATE_DISPLAY_PENDING 1 -/**the surface is needed for prediction, the codec manipulates this*/ -#define AV_XVMC_STATE_PREDICTION 2 -/**this surface is needed for subpicture rendering*/ -#define AV_XVMC_STATE_OSD_SOURCE 4 -/**<magic value to ensure that regular pixel routines haven't corrupted the struct*/ -// 1337 IDCT MCo -#define AV_XVMC_RENDER_MAGIC 0x1DC711C0 +#define AV_XVMC_STATE_DISPLAY_PENDING 1 /** the surface should be shown, the video driver manipulates this */ +#define AV_XVMC_STATE_PREDICTION 2 /** the surface is needed for prediction, the codec manipulates this */ +#define AV_XVMC_STATE_OSD_SOURCE 4 /** this surface is needed for subpicture rendering */ +#define AV_XVMC_RENDER_MAGIC 0x1DC711C0 /**< magic value to ensure that regular pixel routines haven't corrupted the struct */ + // 1337 IDCT MCo #if LIBAVCODEC_VERSION_MAJOR < 53 #define MP_XVMC_STATE_DISPLAY_PENDING AV_XVMC_STATE_DISPLAY_PENDING @@ -45,41 +41,41 @@ struct xvmc_render_state { /** set by calling application */ //@{ - int magic; ///< used as check for memory corruption by regular pixel routines + int magic; ///< used as check for memory corruption by regular pixel routines short* data_blocks; XvMCMacroBlock* mv_blocks; int total_number_of_mv_blocks; int total_number_of_data_blocks; - int mc_type; ///<XVMC_MPEG1/2/4,XVMC_H263 without XVMC_IDCT - int idct; ///< indicate that IDCT acceleration level is used - int chroma_format; ///< XVMC_CHROMA_FORMAT_420/422/444 - int unsigned_intra; ///<+-128 for intra pictures after clipping - XvMCSurface* p_surface; ///<pointer to rendered surface, never changed + int mc_type; ///< XVMC_MPEG1/2/4,XVMC_H263 without XVMC_IDCT + int idct; ///< indicate that IDCT acceleration level is used + int chroma_format; ///< XVMC_CHROMA_FORMAT_420/422/444 + int unsigned_intra; ///< +-128 for intra pictures after clipping + XvMCSurface* p_surface; ///< pointer to rendered surface, never changed //}@ /** set by the decoder used by the XvMCRenderSurface function */ //@{ - XvMCSurface* p_past_surface; ///<pointer to the past surface - XvMCSurface* p_future_surface; ///<pointer to the future prediction surface + XvMCSurface* p_past_surface; ///< pointer to the past surface + XvMCSurface* p_future_surface; ///< pointer to the future prediction surface - unsigned int picture_structure; ///<top/bottom fields or frame! - unsigned int flags; ///<XVMC_SECOND_FIELD - 1st or 2nd field in the sequence - unsigned int display_flags; ///<1,2 or 1+2 fields for XvMCPutSurface + unsigned int picture_structure; ///< top/bottom fields or frame! + unsigned int flags; ///< XVMC_SECOND_FIELD - 1st or 2nd field in the sequence + unsigned int display_flags; ///< 1,2 or 1+2 fields for XvMCPutSurface //}@ /** modified by calling application and the decoder */ //@{ - 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, changed by decoder + 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, changed by decoder - int next_free_data_block_num; ///<used in add_mv_block, pointer to next free block + 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 + void* p_osd_target_surface_render; ///< pointer to the surface where subpicture is rendered //}@ }; |