working on AVI

data/formats/avi/structs.h

@@ -2,10 +2,10 @@
 
 typedef uint8_t FOURCC[4];
 
-struct AVICommonHeader {
-	FOURCC fourcc;
-	uint32_t length;
-};
+//struct AVICommonHeader {
+//	FOURCC fourcc;
+//	uint32_t length;
+//};
 
 struct AVITypeHeader {
 	FOURCC fourcc;
@@ -14,6 +14,8 @@ struct AVITypeHeader {
 };
 
 struct AVIMainHeader {
+	FOURCC fourcc;
+	uint32_t cb;
 	uint32_t ms_per_frame;
 	uint32_t max_bytes_per_sec;
 	uint32_t padding_granularity;
@@ -27,9 +29,16 @@ struct AVIMainHeader {
 	uint32_t reserved[4];
 };
 
+struct AVIRect {
+	uint16_t left;
+	uint16_t top;
+	uint16_t right;
+	uint16_t bottom;
+};
+
 struct AVIStreamHeader {
-	//FOURCC fourcc;
-	//uint32_t length;
+	FOURCC fourcc;
+	uint32_t cb;
 	FOURCC type;
 	FOURCC fcc_handler;
 	uint32_t flags;
@@ -43,12 +52,7 @@ struct AVIStreamHeader {
 	uint32_t suggested_buffer_size;
 	uint32_t quality;
 	uint32_t sample_size;
-	struct {
-		uint16_t left;
-		uint16_t top;
-		uint16_t right;
-		uint16_t bottom;
-	} rcFrame;
+	AVIRect rcFrame;
 };
 
 struct BitMapInfoHeader {