X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fvrender.C;h=ae3503cdad4515016275eb3def3aaaca58ea84d8;hp=4c3011622a01e0514c3ca20b05e11a77dbc2cded;hb=a4de4732339bf38b5b225c533be1bdf60748f04a;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd

diff --git a/cinelerra-5.1/cinelerra/vrender.C b/cinelerra-5.1/cinelerra/vrender.C
index 4c301162..ae3503cd 100644
--- a/cinelerra-5.1/cinelerra/vrender.C
+++ b/cinelerra-5.1/cinelerra/vrender.C
@@ -29,7 +29,6 @@
 #include "edl.h"
 #include "edlsession.h"
 #include "file.h"
-#include "interlacemodes.h"
 #include "localsession.h"
 #include "mainsession.h"
 #include "mwindow.h"
@@ -144,28 +143,13 @@ int VRender::process_buffer(int64_t input_position,
 	use_vconsole = get_use_vconsole(&playable_edit, input_position, use_brender);
 	if(debug) printf("VRender::process_buffer %d use_vconsole=%d\n", __LINE__, use_vconsole);
 
-	if( playable_edit ) { 
-// Asset and output device must have same resulting de-interlacing method
-		Indexable *source = playable_edit->get_source();
-		if( source->is_asset ) {
-			Asset *asset = (Asset *)source;
-			if( ilaceautofixmethod2(renderengine->edl->session->interlace_mode,
-					asset->interlace_autofixoption, asset->interlace_mode,
-					asset->interlace_fixmethod) != BC_ILACE_FIXMETHOD_NONE )
-				return 1;
-		}
-	}
-
 // Negotiate color model
 	colormodel = get_colormodel(playable_edit, use_vconsole, use_brender);
 	if(debug) printf("VRender::process_buffer %d\n", __LINE__);
 
 
-
-
 // Get output buffer from device
-	if(renderengine->command->realtime &&
-		!renderengine->is_nested)
+	if(renderengine->command->realtime && !renderengine->is_nested)
 	{
 		renderengine->video->new_output_buffer(&video_out, colormodel);
 	}
@@ -260,8 +244,7 @@ int VRender::get_use_vconsole(VEdit **playable_edit,
 
 // Descend into EDL nest
 	return renderengine->get_edl()->get_use_vconsole(playable_edit,
-		position,
-		renderengine->command->get_direction(),
+		position, renderengine->command->get_direction(),
 		vconsole->playable_tracks);
 }
 
@@ -362,8 +345,8 @@ int VRender::get_colormodel(VEdit *playable_edit,
 				current_position,
 				renderengine->command->get_direction());
 		}
-
-		if(asset)
+// ffmpeg files are side effected by color_model, affects colorspace,color_range
+		if( asset && asset->format != FILE_FFMPEG )
 		{
 			file = renderengine->get_vcache()->check_out(asset,
 				renderengine->get_edl());