Merge branch 'master' of https://collaborating.tuhh.de/cev7691/mandelbrot-zoom

1 files changed, 11 insertions, 26 deletions

diff --git a/src/creator.h b/src/creator.h
index 7606d4e..b89b16c 100644
--- a/src/creator.h
+++ b/src/creator.h
@@ -18,36 +18,21 @@
 #include <libavutil/frame.h>
 #include <libavutil/imgutils.h>
 
-typedef struct config {
-	u32 iterations;
-	u8 threads;
-	u32 colorFrom;
-	u32 colorTo;
-	long double to_x;
-	long double to_y;
-	long double speed;
-	u8 video;
-	u8 filetype;
-	u16 width;
-	u16 height;
-	u8 renderFPS;
-	u8 videoFPS;
-	u32 bitrate;
-	const char *path;
-	// TODO: key mapping als option in die struct
-} Config;
-
-Config *_config;
-u32 (*_sfunc) (long double, long double, u32);
-u32 *s_arr;
-long double x_min, x_max, y_min, y_max;
-long double x_min_s, x_max_s, y_min_s, y_max_s;
-int delta;
-long double dt, ft;
+
+AVFrame *picture;
+AVPacket *pkt;
+
+FILE *f;
+
+
+const AVCodec *codec;
+AVCodecContext *c= NULL;
+int i, ret, x, y;
 
 static void encode(AVCodecContext *enc_ctx, AVFrame *frame, AVPacket *pkt, FILE *outfile);
 
 int generateVideo(filename, int width, int height, int fps, int bitRate, Config *config, u32 (*sfunc) (long double, long double, u32));
 
+void addFrame(int *frame);
 
 #endif /* RENDER_H_ */