diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-19 01:19:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-19 01:19:38 +0100 |
| commit | c130428ab5a17911d0bfa11f804ec05e6f7a53e6 (patch) | |
| tree | f306849a3482395433a246d50ec3b3a57c908c5a /tests/base64.c | |
| parent | 6fd4b8a6ef13bd2d47521ed6894d25de45610291 (diff) | |
| parent | 0184bbe2d1e9a77ebe04e61f84a967662b79d387 (diff) | |
| download | ffmpeg-c130428ab5a17911d0bfa11f804ec05e6f7a53e6.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avprobe, cmdutils: K&R formatting cosmetics
tests: K&R formatting cosmetics for test programs
lavf: free packets for muxers implementing interleave_packet().
lavf: fix and extend av_interleaved_write_frame() doxy.
mov: Remove dead stores for spherical coordinates for channel position.
error_resilience: K&R formatting cosmetics
RELEASE_NOTES: mention hiding private symbols in shared builds.
RELEASE_NOTES: mention some notable API changes in 0.8
Conflicts:
cmdutils.h
doc/RELEASE_NOTES
ffprobe.c
libavcodec/error_resilience.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/base64.c')
| -rw-r--r-- | tests/base64.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/base64.c b/tests/base64.c index 75ba8bc5d2..5035ad96a7 100644 --- a/tests/base64.c +++ b/tests/base64.c @@ -27,18 +27,19 @@ int main(void) static const char b64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; unsigned i_bits = 0; - int i_shift = 0; - int out_len = 0; + int i_shift = 0; + int out_len = 0; int in; -#define putb64() do { \ +#define putb64() \ + do { \ putchar(b64[(i_bits << 6 >> i_shift) & 0x3f]); \ out_len++; \ i_shift -= 6; \ } while (0) while ((in = getchar()) != EOF) { - i_bits = (i_bits << 8) + in; + i_bits = (i_bits << 8) + in; i_shift += 8; while (i_shift > 6) putb64(); |