[FFmpeg-soc] [soc]: r727 - dirac/libavcodec/dirac.c
marco
subversion at mplayerhq.hu
Sun Aug 12 19:50:36 CEST 2007
Author: marco
Date: Sun Aug 12 19:50:35 2007
New Revision: 727
Log:
Fix indentation
Modified:
dirac/libavcodec/dirac.c
Modified: dirac/libavcodec/dirac.c
==============================================================================
--- dirac/libavcodec/dirac.c (original)
+++ dirac/libavcodec/dirac.c Sun Aug 12 19:50:35 2007
@@ -2383,19 +2383,22 @@ static int dirac_motion_compensation(AVC
for (i = 0; i < s->blwidth; i++) {
struct dirac_blockmotion *block = &currblock[i];
- if (block->use_ref[0] == 0 && block->use_ref[1] == 0) {
- /* Intra */
- motion_comp_dc_block(avctx, coeffs, i, j, block->dc[comp]);
- } else if (block->use_ref[1] == 0) {
- /* Reference frame 1 only. */
- motion_comp_block1ref(avctx, coeffs, i, j, s->ref1data, 0, block, comp);
- } else if (block->use_ref[0] == 0) {
- /* Reference frame 2 only. */
- motion_comp_block1ref(avctx, coeffs, i, j, s->ref2data, 1, block, comp);
- } else {
- motion_comp_block2refs(avctx, coeffs, i, j, s->ref1data, s->ref2data, block, comp);
- }
-
+ /* Intra */
+ if (block->use_ref[0] == 0 && block->use_ref[1] == 0)
+ motion_comp_dc_block(avctx, coeffs, i, j,
+ block->dc[comp]);
+ /* Reference frame 1 only. */
+ else if (block->use_ref[1] == 0)
+ motion_comp_block1ref(avctx, coeffs, i, j, s->ref1data,
+ 0, block, comp);
+ /* Reference frame 2 only. */
+ else if (block->use_ref[0] == 0)
+ motion_comp_block1ref(avctx, coeffs, i, j, s->ref2data,
+ 1, block, comp);
+ /* Both reference frames. */
+ else
+ motion_comp_block2refs(avctx, coeffs, i, j,
+ s->ref1data, s->ref2data, block, comp);
}
currblock += s->blwidth;
}
More information about the FFmpeg-soc
mailing list