aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2009-02-14 17:45:38 +0000
committerDiego Biurrun <diego@biurrun.de>2009-02-14 17:45:38 +0000
commit6b6ea1dfdfca738d4da9815e35c643d7f0b2f0bf (patch)
treee85dd2d7004932cbf771c6bd6622d1ac72cf43cc
parente0dcbda24b4b04640bd0a8c8e8d0c92ee8886b55 (diff)
downloadffmpeg-6b6ea1dfdfca738d4da9815e35c643d7f0b2f0bf.tar.gz
whitespace cosmetics: vertical alignment
Originally committed as revision 17249 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/xvmc.h52
1 files changed, 24 insertions, 28 deletions
diff --git a/libavcodec/xvmc.h b/libavcodec/xvmc.h
index 810104e25b..347d2142e8 100644
--- a/libavcodec/xvmc.h
+++ b/libavcodec/xvmc.h
@@ -30,14 +30,10 @@
#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
-// 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 // 1337 IDCT MCo
#if LIBAVCODEC_VERSION_MAJOR < 53
#define MP_XVMC_STATE_DISPLAY_PENDING AV_XVMC_STATE_DISPLAY_PENDING
@@ -48,35 +44,35 @@
struct xvmc_render_state {
//these are not changed by the decoder!
- 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
+ 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
//these are changed 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
//these are for internal communication
- 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
};