[SCM] libav/experimental: Reindent
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 17:18:56 UTC 2013
The following commit has been merged in the experimental branch:
commit 4106b7f1cd7151804e1138c473550cf20354c39b
Author: Martin Storsjö <martin at martin.st>
Date: Fri Nov 12 12:28:02 2010 +0000
Reindent
Originally committed as revision 25732 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index 9d63be4..bdcd985 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -402,18 +402,18 @@ static void adpcm_compress_trellis(AVCodecContext *avctx, const short *samples,
goto next_##NAME;\
}\
u = nodes_next[pos];\
- if(!u) {\
- assert(pathn < FREEZE_INTERVAL<<avctx->trellis);\
- u = t++;\
- nodes_next[pos] = u;\
- u->path = pathn++;\
- }\
- u->ssd = ssd;\
- u->step = STEP_INDEX;\
- u->sample2 = nodes[j]->sample1;\
- u->sample1 = dec_sample;\
- paths[u->path].nibble = nibble;\
- paths[u->path].prev = nodes[j]->path;\
+ if(!u) {\
+ assert(pathn < FREEZE_INTERVAL<<avctx->trellis);\
+ u = t++;\
+ nodes_next[pos] = u;\
+ u->path = pathn++;\
+ }\
+ u->ssd = ssd;\
+ u->step = STEP_INDEX;\
+ u->sample2 = nodes[j]->sample1;\
+ u->sample1 = dec_sample;\
+ paths[u->path].nibble = nibble;\
+ paths[u->path].prev = nodes[j]->path;\
/* Sift the newly inserted node down in the heap to \
* restore the heap property. */\
while (pos > 0) {\
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list