RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-01 04:13:57 +00:00
Code Issues Projects Releases Wiki Activity

whitespace cosmetics: Restore vertical alignment.

Browse Source 
Originally committed as revision 17253 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2009-02-14 18:15:59 +00:00
parent aae667ba4d
commit c1a5aa2953
1 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
libavcodec/xvmc.h
View File

@ -25,15 +25,11 @@
#include "avcodec.h" #include "avcodec.h"
/**the surface should be shown, the video driver manipulates this*/ #define AV_XVMC_STATE_DISPLAY_PENDING 1 /** the surface should be shown, the video driver manipulates this */
#define AV_XVMC_STATE_DISPLAY_PENDING 1 #define AV_XVMC_STATE_PREDICTION 2 /** the surface is needed for prediction, the codec manipulates this */
/**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_STATE_PREDICTION 2 #define AV_XVMC_RENDER_MAGIC 0x1DC711C0 /**< magic value to ensure that regular pixel routines haven't corrupted the struct */
/**this surface is needed for subpicture rendering*/ // 1337 IDCT MCo
#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
#if LIBAVCODEC_VERSION_MAJOR < 53 #if LIBAVCODEC_VERSION_MAJOR < 53
#define MP_XVMC_STATE_DISPLAY_PENDING AV_XVMC_STATE_DISPLAY_PENDING #define MP_XVMC_STATE_DISPLAY_PENDING AV_XVMC_STATE_DISPLAY_PENDING
@ -45,41 +41,41 @@
struct xvmc_render_state { struct xvmc_render_state {
/** set by calling application */ /** 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; short* data_blocks;
XvMCMacroBlock* mv_blocks; XvMCMacroBlock* mv_blocks;
int total_number_of_mv_blocks; int total_number_of_mv_blocks;
int total_number_of_data_blocks; int total_number_of_data_blocks;
int mc_type; ///<XVMC_MPEG1/2/4,XVMC_H263 without XVMC_IDCT int mc_type; ///< XVMC_MPEG1/2/4,XVMC_H263 without XVMC_IDCT
int idct; ///< indicate that IDCT acceleration level is used int idct; ///< indicate that IDCT acceleration level is used
int chroma_format; ///< XVMC_CHROMA_FORMAT_420/422/444 int chroma_format; ///< XVMC_CHROMA_FORMAT_420/422/444
int unsigned_intra; ///<+-128 for intra pictures after clipping int unsigned_intra; ///< +-128 for intra pictures after clipping
XvMCSurface* p_surface; ///<pointer to rendered surface, never changed XvMCSurface* p_surface; ///< pointer to rendered surface, never changed
//}@ //}@
/** set by the decoder /** set by the decoder
used by the XvMCRenderSurface function */ used by the XvMCRenderSurface function */
//@{ //@{
XvMCSurface* p_past_surface; ///<pointer to the past surface XvMCSurface* p_past_surface; ///< pointer to the past surface
XvMCSurface* p_future_surface; ///<pointer to the future prediction surface XvMCSurface* p_future_surface; ///< pointer to the future prediction surface
unsigned int picture_structure; ///<top/bottom fields or frame! unsigned int picture_structure; ///< top/bottom fields or frame!
unsigned int flags; ///<XVMC_SECOND_FIELD - 1st or 2nd field in the sequence 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 display_flags; ///< 1,2 or 1+2 fields for XvMCPutSurface
//}@ //}@
/** modified by calling application and the decoder */ /** modified by calling application and the decoder */
//@{ //@{
int state; ///<0 - free, 1 - waiting to display, 2 - waiting for prediction 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 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 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 */ /** 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
//}@ //}@
}; };