X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.0%2Fcinelerra%2Ffilebase.h;fp=cinelerra-5.0%2Fcinelerra%2Ffilebase.h;h=31ecf92d76fbda27d264f88e4a85147fe950a829;hb=f9d0d999e813ae19965e07ae2f7da690b4e6fe45;hp=fa3aeb83ee10a76a61b2920f728778c34945066f;hpb=15359610833cd03c44fe47f5d002e643103610ec;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.0/cinelerra/filebase.h b/cinelerra-5.0/cinelerra/filebase.h
index fa3aeb83..31ecf92d 100644
--- a/cinelerra-5.0/cinelerra/filebase.h
+++ b/cinelerra-5.0/cinelerra/filebase.h
@@ -24,7 +24,7 @@
 
 #include "asset.inc"
 #include "assets.inc"
-#include "colormodels.h"
+#include "bccmodels.h"
 #include "edit.inc"
 #include "ffmpeg.inc"
 #include "guicast.h"
@@ -188,10 +188,7 @@ protected:
 // allocate a buffer for translating video to VFrame
 	int get_video_buffer(unsigned char **buffer, int depth); // video
 	int get_row_pointers(unsigned char *buffer, unsigned char ***pointers, int depth);
-	static int match4(const char *in, const char *out);   // match 4 bytes for a quicktime type
-
-	int64_t ima4_samples_to_bytes(int64_t samples, int channels);
-	int64_t ima4_bytes_to_samples(int64_t bytes, int channels);
+	static int match4(const char *in, const char *out);   // match 4 bytes for a fourcc type
 
 	float *float_buffer;          // for floating point feathering
 	unsigned char **row_pointers_in, **row_pointers_out;
@@ -231,20 +228,6 @@ private:
 	float *ulawtofloat_table, *ulawtofloat_ptr;
 	unsigned char *floattoulaw_table, *floattoulaw_ptr;
 
-// IMA4
-	int init_ima4();
-	int delete_ima4();
-	int ima4_decode_block(int16_t *output, unsigned char *input);
-	int ima4_decode_sample(int *predictor, int nibble, int *index, int *step);
-	int ima4_encode_block(unsigned char *output, int16_t *input, int step, int channel);
-	int ima4_encode_sample(int *last_sample, int *last_index, int *nibble, int next_sample);
-
-	static int ima4_step[89];
-	static int ima4_index[16];
-	int *last_ima4_samples;
-	int *last_ima4_indexes;
-	int ima4_block_size;
-	int ima4_block_samples;
 	OverlayFrame *overlayer;
 };