aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/vmdav.c
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2011-02-23 13:11:09 -0500
committerMichael Niedermayer <michaelni@gmx.at>2011-02-26 03:16:03 +0100
commit83e94d50cbc55f8185fef98aebd2781525b8e3c5 (patch)
tree0021d8ced8cf3ecc07419e66da2c8ac506480246 /libavcodec/vmdav.c
parentfb0e3c2b9696c7adc71db872f847a4d6497b5eed (diff)
downloadandroid_external_ffmpeg-83e94d50cbc55f8185fef98aebd2781525b8e3c5.tar.gz
android_external_ffmpeg-83e94d50cbc55f8185fef98aebd2781525b8e3c5.tar.bz2
android_external_ffmpeg-83e94d50cbc55f8185fef98aebd2781525b8e3c5.zip
cosmetics: reindent after previous commit
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit ba9516cca845f8d3fb7ac08ef53a996c3ee0dbf5)
Diffstat (limited to 'libavcodec/vmdav.c')
-rw-r--r--libavcodec/vmdav.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/vmdav.c b/libavcodec/vmdav.c
index b3103ec220..d0ffa39f78 100644
--- a/libavcodec/vmdav.c
+++ b/libavcodec/vmdav.c
@@ -486,15 +486,15 @@ static int vmdaudio_loadsound(VmdAudioContext *s, unsigned char *data,
memset(data, 0, silent_size);
data += silent_size;
}
- 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 (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 silent_size + data_size * 2;
}