mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
whitespace cosmetics: Fix indentation depth.
Originally committed as revision 17233 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
8e5cfb6e82
commit
39dba5e8df
@ -48,16 +48,16 @@ void XVMC_init_block(MpegEncContext *s){
|
|||||||
}
|
}
|
||||||
|
|
||||||
void XVMC_pack_pblocks(MpegEncContext *s, int cbp){
|
void XVMC_pack_pblocks(MpegEncContext *s, int cbp){
|
||||||
int i,j;
|
int i,j;
|
||||||
const int mb_block_count = 4+(1<<s->chroma_format);
|
const int mb_block_count = 4+(1<<s->chroma_format);
|
||||||
|
|
||||||
j=0;
|
j=0;
|
||||||
cbp<<= 12-mb_block_count;
|
cbp<<= 12-mb_block_count;
|
||||||
for(i=0; i<mb_block_count; i++){
|
for(i=0; i<mb_block_count; i++){
|
||||||
if(cbp & (1<<11)) {
|
if(cbp & (1<<11)) {
|
||||||
s->pblocks[i] = (short *)(&s->block[(j++)]);
|
s->pblocks[i] = (short *)(&s->block[(j++)]);
|
||||||
}else{
|
}else{
|
||||||
s->pblocks[i] = NULL;
|
s->pblocks[i] = NULL;
|
||||||
}
|
}
|
||||||
cbp+=cbp;
|
cbp+=cbp;
|
||||||
}
|
}
|
||||||
@ -119,11 +119,11 @@ void XVMC_field_end(MpegEncContext *s){
|
|||||||
}
|
}
|
||||||
|
|
||||||
void XVMC_decode_mb(MpegEncContext *s){
|
void XVMC_decode_mb(MpegEncContext *s){
|
||||||
XvMCMacroBlock * mv_block;
|
XvMCMacroBlock * mv_block;
|
||||||
struct xvmc_render_state * render;
|
struct xvmc_render_state * render;
|
||||||
int i,cbp,blocks_per_mb;
|
int i,cbp,blocks_per_mb;
|
||||||
|
|
||||||
const int mb_xy = s->mb_y * s->mb_stride + s->mb_x;
|
const int mb_xy = s->mb_y * s->mb_stride + s->mb_x;
|
||||||
|
|
||||||
|
|
||||||
if(s->encoding){
|
if(s->encoding){
|
||||||
@ -155,7 +155,7 @@ const int mb_xy = s->mb_y * s->mb_stride + s->mb_x;
|
|||||||
|
|
||||||
//take the next free macroblock
|
//take the next free macroblock
|
||||||
mv_block = &render->mv_blocks[render->start_mv_blocks_num +
|
mv_block = &render->mv_blocks[render->start_mv_blocks_num +
|
||||||
render->filled_mv_blocks_num ];
|
render->filled_mv_blocks_num ];
|
||||||
|
|
||||||
mv_block->x = s->mb_x;
|
mv_block->x = s->mb_x;
|
||||||
mv_block->y = s->mb_y;
|
mv_block->y = s->mb_y;
|
||||||
@ -276,7 +276,7 @@ const int mb_xy = s->mb_y * s->mb_stride + s->mb_x;
|
|||||||
//copy blocks only if the codec doesn't support pblocks reordering
|
//copy blocks only if the codec doesn't support pblocks reordering
|
||||||
if(s->avctx->xvmc_acceleration == 1){
|
if(s->avctx->xvmc_acceleration == 1){
|
||||||
memcpy(&render->data_blocks[(render->next_free_data_block_num)*64],
|
memcpy(&render->data_blocks[(render->next_free_data_block_num)*64],
|
||||||
s->pblocks[i],sizeof(short)*8*8);
|
s->pblocks[i],sizeof(short)*8*8);
|
||||||
}
|
}
|
||||||
render->next_free_data_block_num++;
|
render->next_free_data_block_num++;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user