Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'

[ffmpeg] / libavcodec / g2meet.c

diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c
index 67bb1fd31ae7d720156798fce400fce35ff6c594..41faf7e2d596df6c4e0b4ae90c82fa2352447260 100644 (file)
--- a/libavcodec/g2meet.c
+++ b/libavcodec/g2meet.c
@@ -28,12 +28,14 @@
 #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"
 
 enum ChunkType {
@@ -262,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++) {