aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2009-02-14 19:00:51 +0000
committerDiego Biurrun <diego@biurrun.de>2009-02-14 19:00:51 +0000
commit4ec58e1397e2726ec25f8a1b22b83545c9404ddb (patch)
tree30c027100347fa4e2154426f40204fabbd5a1d13
parent9f00a41cb3431d543038d4f2560a0dc318978750 (diff)
downloadffmpeg-4ec58e1397e2726ec25f8a1b22b83545c9404ddb.tar.gz
cosmetics: Consistently format all if/else statements in K&R style
and drop braces from if statements where unnecessary. Originally committed as revision 17260 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/mpegvideo_xvmc.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/libavcodec/mpegvideo_xvmc.c b/libavcodec/mpegvideo_xvmc.c
index cedc0b90b5..44e779648c 100644
--- a/libavcodec/mpegvideo_xvmc.c
+++ b/libavcodec/mpegvideo_xvmc.c
@@ -52,11 +52,10 @@ void ff_xvmc_pack_pblocks(MpegEncContext *s, int cbp)
j = 0;
cbp <<= 12-mb_block_count;
for (i = 0; i < mb_block_count; i++) {
- if (cbp & (1<<11)) {
+ if (cbp & (1 << 11))
s->pblocks[i] = (short *)(&s->block[j++]);
- }else{
+ else
s->pblocks[i] = NULL;
- }
cbp+=cbp;
}
}
@@ -161,9 +160,9 @@ void ff_xvmc_decode_mb(MpegEncContext *s)
mv_block->x = s->mb_x;
mv_block->y = s->mb_y;
mv_block->dct_type = s->interlaced_dct;//XVMC_DCT_TYPE_FRAME/FIELD;
- if (s->mb_intra){
+ if (s->mb_intra) {
mv_block->macroblock_type = XVMC_MB_TYPE_INTRA;//no MC, all done
- }else{
+ } else {
mv_block->macroblock_type = XVMC_MB_TYPE_PATTERN;
if (s->mv_dir & MV_DIR_FORWARD) {
@@ -214,7 +213,7 @@ void ff_xvmc_decode_mb(MpegEncContext *s)
mv_block->PMV[1][1][0] = s->mv[0][3][0];//dmv10, bottom from top
mv_block->PMV[1][1][1] = s->mv[0][3][1]<<1;//dmv11
- }else{
+ } else {
mv_block->PMV[0][1][0] = s->mv[0][2][0];//dmv00
mv_block->PMV[0][1][1] = s->mv[0][2][1];//dmv01
}
@@ -254,13 +253,13 @@ void ff_xvmc_decode_mb(MpegEncContext *s)
}
if (s->flags & CODEC_FLAG_GRAY) {
- if (s->mb_intra){//intra frames are always full chroma block
+ if (s->mb_intra) {//intra frames are always full chroma block
for (i = 4; i < blocks_per_mb; i++) {
memset(s->pblocks[i],0,sizeof(short)*8*8);//so we need to clear them
if (!render->unsigned_intra)
s->pblocks[i][0] = 1 << 10;
}
- }else{
+ } else {
cbp &= 0xf << (blocks_per_mb - 4);
blocks_per_mb = 4;//luminance blocks only
}