X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffilejpeglist.C;h=d1c7ba9f8ae974408d974fd13643054e33ded353;hb=b9f98da8f1cd8b7b31ead02fa41f299b56cac3da;hp=b7755996a768f105abad469c84cd7345a19cf18e;hpb=fbb844da24c44cce0509451116df248c861ef8f7;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/filejpeglist.C b/cinelerra-5.1/cinelerra/filejpeglist.C
index b7755996..d1c7ba9f 100644
--- a/cinelerra-5.1/cinelerra/filejpeglist.C
+++ b/cinelerra-5.1/cinelerra/filejpeglist.C
@@ -100,19 +100,11 @@ int FileJPEGList::read_frame(VFrame *frame, VFrame *data)
 {
 	PRINT_TRACE
 
-	mjpeg_t *mjpeg = mjpeg_new(asset->width,
-		asset->height,
-		1);
-	mjpeg_decompress(mjpeg,
-		data->get_data(),
-		data->get_compressed_size(),
-		0,
-		frame->get_rows(),
-		frame->get_y(),
-		frame->get_u(),
-		frame->get_v(),
-		frame->get_color_model(),
-		file->cpus);
+	mjpeg_t *mjpeg = mjpeg_new(asset->width, asset->height, 1);
+	mjpeg_decompress(mjpeg, data->get_data(), data->get_compressed_size(),
+		0, frame->get_rows(),
+		frame->get_y(), frame->get_u(), frame->get_v(),
+		frame->get_color_model(), file->cpus);
 	mjpeg_delete(mjpeg);
 	PRINT_TRACE
 	return 0;
@@ -120,16 +112,10 @@ int FileJPEGList::read_frame(VFrame *frame, VFrame *data)
 
 int FileJPEGList::write_frame(VFrame *frame, VFrame *data)
 {
-	mjpeg_t *mjpeg = mjpeg_new(asset->width,
-		asset->height,
-		1);
-	mjpeg_compress(mjpeg,
-		frame->get_rows(),
-		frame->get_y(),
-		frame->get_u(),
-		frame->get_v(),
-		frame->get_color_model(),
-		file->cpus);
+	mjpeg_t *mjpeg = mjpeg_new(asset->width, asset->height, 1);
+	mjpeg_compress(mjpeg, frame->get_rows(),
+		frame->get_y(), frame->get_u(), frame->get_v(),
+		frame->get_color_model(), file->cpus);
 	data->allocate_compressed_data(mjpeg_output_size(mjpeg));
 	bcopy(mjpeg_output_buffer(mjpeg), frame->get_data(), mjpeg_output_size(mjpeg));
 	mjpeg_delete(mjpeg);
@@ -137,21 +123,11 @@ int FileJPEGList::write_frame(VFrame *frame, VFrame *data)
 }
 
 
-
-
-
-
-
-
-
-
-
 JPEGConfigVideo::JPEGConfigVideo(BC_WindowBase *parent_window, Asset *asset)
  : BC_Window(_(PROGRAM_NAME ": Video Compression"),
  	parent_window->get_abs_cursor_x(),
  	parent_window->get_abs_cursor_y(),
-	400,
-	100)
+	400, 100)
 {
 	this->parent_window = parent_window;
 	this->asset = asset;
@@ -166,17 +142,9 @@ void JPEGConfigVideo::create_objects()
 	int x = 10, y = 10;
 	lock_window("JPEGConfigVideo::create_objects");
 	add_subwindow(new BC_Title(x, y, _("Quality:")));
-	add_subwindow(new BC_ISlider(x + 80,
-		y,
-		0,
-		200,
-		200,
-		0,
-		100,
-		asset->quality,
-		0,
-		0,
-		&asset->quality));
+	add_subwindow(new BC_ISlider(x + 80, y, 0,
+		200, 200, 0, 100, asset->quality,
+		0, 0, &asset->quality));
 
 	add_subwindow(new BC_OKButton(this));
 	unlock_window();
@@ -188,9 +156,3 @@ int JPEGConfigVideo::close_event()
 	return 1;
 }
 
-
-
-
-
-
-