summaryrefslogtreecommitdiff
path: root/libavcodec/mpegvideo_xvmc.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2009-02-14 16:22:11 +0000
committerDiego Biurrun <diego@biurrun.de>2009-02-14 16:22:11 +0000
commit2d7d8cc7f4afefaaeee0d57f6bddc3ada37ba165 (patch)
tree735f4914279f549fc6f40b146d6a5e5b6b86f8b2 /libavcodec/mpegvideo_xvmc.c
parent148302e7e43186a4d604f76d2d3daa96ecece11e (diff)
whitespace cosmetics: another round of formatting consistency fixes
Originally committed as revision 17235 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpegvideo_xvmc.c')
-rw-r--r--libavcodec/mpegvideo_xvmc.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/mpegvideo_xvmc.c b/libavcodec/mpegvideo_xvmc.c
index 3ad2636c6f..96735e764b 100644
--- a/libavcodec/mpegvideo_xvmc.c
+++ b/libavcodec/mpegvideo_xvmc.c
@@ -45,7 +45,7 @@ void XVMC_init_block(MpegEncContext *s)
assert(0);
return;//make sure that this is a render packet
}
- s->block =(DCTELEM *)(render->data_blocks+(render->next_free_data_block_num)*64);
+ s->block = (DCTELEM *)(render->data_blocks+(render->next_free_data_block_num)*64);
}
void XVMC_pack_pblocks(MpegEncContext *s, int cbp)
@@ -79,10 +79,10 @@ int XVMC_field_start(MpegEncContext*s, AVCodecContext *avctx)
return -1;//make sure that this is render packet
render->picture_structure = s->picture_structure;
- render->flags = (s->first_field)? 0: XVMC_SECOND_FIELD;
+ render->flags = (s->first_field) ? 0 : XVMC_SECOND_FIELD;
//make sure that all data is drawn by XVMC_end_frame
- assert(render->filled_mv_blocks_num==0);
+ assert(render->filled_mv_blocks_num == 0);
render->p_future_surface = NULL;
render->p_past_surface = NULL;
@@ -173,7 +173,7 @@ void XVMC_decode_mb(MpegEncContext *s)
mv_block->macroblock_type = XVMC_MB_TYPE_PATTERN;
if (s->mv_dir & MV_DIR_FORWARD) {
- mv_block->macroblock_type|= XVMC_MB_TYPE_MOTION_FORWARD;
+ mv_block->macroblock_type |= XVMC_MB_TYPE_MOTION_FORWARD;
//pmv[n][dir][xy]=mv[dir][n][xy]
mv_block->PMV[0][0][0] = s->mv[0][0][0];
mv_block->PMV[0][0][1] = s->mv[0][0][1];
@@ -181,7 +181,7 @@ void XVMC_decode_mb(MpegEncContext *s)
mv_block->PMV[1][0][1] = s->mv[0][1][1];
}
if (s->mv_dir & MV_DIR_BACKWARD) {
- mv_block->macroblock_type|=XVMC_MB_TYPE_MOTION_BACKWARD;
+ mv_block->macroblock_type |= XVMC_MB_TYPE_MOTION_BACKWARD;
mv_block->PMV[0][1][0] = s->mv[1][0][0];
mv_block->PMV[0][1][1] = s->mv[1][0][1];
mv_block->PMV[1][1][0] = s->mv[1][1][0];
@@ -254,7 +254,7 @@ void XVMC_decode_mb(MpegEncContext *s)
// calculate cbp
cbp = 0;
for (i = 0; i < blocks_per_mb; i++) {
- cbp+= cbp;
+ cbp += cbp;
if (s->block_last_index[i] >= 0)
cbp++;
}