diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-08 20:48:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-08 20:48:44 +0200 |
| commit | edaca0812a05523b82039d5be6b1aa069b68b9c6 (patch) | |
| tree | 757cefd3ebea24e8823aedaef832c8d25bf1d1a8 | |
| parent | 8e1717cf12f88823b851cca706a2e5ab7aa1c7c4 (diff) | |
| parent | bb815dfc38b8ef7a89d6b9684ce0cdc296385d6d (diff) | |
| download | ffmpeg-edaca0812a05523b82039d5be6b1aa069b68b9c6.tar.gz | |
Merge commit 'bb815dfc38b8ef7a89d6b9684ce0cdc296385d6d'
* commit 'bb815dfc38b8ef7a89d6b9684ce0cdc296385d6d':
g2meet: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/g2meet.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c index 6b00c9088d..41faf7e2d5 100644 --- a/libavcodec/g2meet.c +++ b/libavcodec/g2meet.c @@ -28,11 +28,12 @@ #include <zlib.h> #include "libavutil/intreadwrite.h" + #include "avcodec.h" #include "blockdsp.h" #include "bytestream.h" -#include "idctdsp.h" #include "get_bits.h" +#include "idctdsp.h" #include "internal.h" #include "jpegtables.h" #include "mjpeg.h" @@ -263,7 +264,8 @@ static int jpg_decode_data(JPGContext *c, int width, int height, for (i = 0; i < 3; i++) c->prev_dc[i] = 1024; - bx = by = 0; + bx = + by = 0; c->bdsp.clear_blocks(c->block[0]); for (mb_y = 0; mb_y < mb_h; mb_y++) { for (mb_x = 0; mb_x < mb_w; mb_x++) { |