diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2011-02-23 13:11:00 -0500 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-02-26 03:16:03 +0100 |
| commit | 684512e16df647a8b526534cbf6c56556a651887 (patch) | |
| tree | 32b67c4ddb4eb79eecc4145b398e84535a8bda21 /libavcodec | |
| parent | aa23625037322258c7583ddbd47196553a73dc1e (diff) | |
| download | ffmpeg-684512e16df647a8b526534cbf6c56556a651887.tar.gz | |
cosmetics: reindent after previous commit
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 868f2f4d90e07edd9a65bd9b917bb5940643ec75)
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vmdav.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libavcodec/vmdav.c b/libavcodec/vmdav.c index 5ee4248ab7..e307b533e1 100644 --- a/libavcodec/vmdav.c +++ b/libavcodec/vmdav.c @@ -484,19 +484,19 @@ static int vmdaudio_loadsound(VmdAudioContext *s, unsigned char *data, // if (silence) // av_log(s->avctx, AV_LOG_INFO, "silent block!\n"); - if (silence) { - memset(data, 0, data_size * 2); - } else { - if (s->bits == 16) - vmdaudio_decode_audio(s, data, buf, data_size, s->channels == 2); - else { - /* copy the data but convert it to signed */ - for (i = 0; i < data_size; i++){ - *data++ = buf[i] + 0x80; - *data++ = buf[i] + 0x80; - } + if (silence) { + memset(data, 0, data_size * 2); + } else { + if (s->bits == 16) + vmdaudio_decode_audio(s, data, buf, data_size, s->channels == 2); + else { + /* copy the data but convert it to signed */ + for (i = 0; i < data_size; i++){ + *data++ = buf[i] + 0x80; + *data++ = buf[i] + 0x80; } } + } return data_size * 2; } |