X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffilejpeg.h;h=21846cf42ed282ec50615686bfac7c227b5296bc;hp=d6fbe43e5753e88e3c9aef360ec471184cd09f4b;hb=502b6f3b6fd04f6b01c6d70dcb81aa304dd0db1c;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd

diff --git a/cinelerra-5.1/cinelerra/filejpeg.h b/cinelerra-5.1/cinelerra/filejpeg.h
index d6fbe43e..21846cf4 100644
--- a/cinelerra-5.1/cinelerra/filejpeg.h
+++ b/cinelerra-5.1/cinelerra/filejpeg.h
@@ -2,26 +2,27 @@
 /*
  * CINELERRA
  * Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
+ *
  */
 
 #ifndef FILEJPEG_H
 #define FILEJPEG_H
 
+#include "edl.inc"
 #include "file.inc"
 #include "filelist.h"
 #include "vframe.inc"
@@ -34,11 +35,9 @@ public:
 
 // basic commands for every file interpreter
 	static int check_sig(Asset *asset);
-	static void get_parameters(BC_WindowBase *parent_window, 
-		Asset *asset, 
-		BC_WindowBase* &format_window,
-		int audio_options,
-		int video_options);
+	static void get_parameters(BC_WindowBase *parent_window,
+		Asset *asset, BC_WindowBase* &format_window,
+		int audio_options, int video_options, EDL *edl);
 
 	static int get_best_colormodel(Asset *asset, int driver);
 	int colormodel_supported(int colormodel);
@@ -46,6 +45,7 @@ public:
 	int write_frame(VFrame *frame, VFrame *data, FrameWriterUnit *unit);
 	int can_copy_from(Asset *asset, int64_t position);
 	int read_frame_header(char *path);
+	static int read_header(FILE *fp, int &w, int &h);
 	FrameWriterUnit* new_writer_unit(FrameWriter *writer);
 
 	void *decompressor;