X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffilelist.C;h=4614f3f831f40cf9e842f3be3dafd65b629448c5;hb=15df6cbff7373d232ae0b8dcaecd9aa51ff5c388;hp=9f24e67a06c9579a1b3818d1e7e9a4af4105c4cd;hpb=4d515bb7ba93b462bc7871b38cdceec988c1e733;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/filelist.C b/cinelerra-5.1/cinelerra/filelist.C
index 9f24e67a..4614f3f8 100644
--- a/cinelerra-5.1/cinelerra/filelist.C
+++ b/cinelerra-5.1/cinelerra/filelist.C
@@ -296,7 +296,7 @@ int FileList::read_frame(VFrame *frame)
 
 		FILE *in;
 
-// Fix path for VFS
+// Fix path for VFS.  Not used anymore.
 		if(!strncmp(asset->path, RENDERFARM_FS_PREFIX, strlen(RENDERFARM_FS_PREFIX)))
 			sprintf(string, "%s%s", RENDERFARM_FS_PREFIX, path);
 		else
@@ -400,38 +400,9 @@ int FileList::read_frame(VFrame *frame)
 
 		if(!temp) return result;
 
-// printf("FileList::read_frame frame=%d temp=%d\n",
-// frame->get_color_model(),
-// temp->get_color_model());
-		if(frame->get_color_model() == temp->get_color_model())
-		{
-			frame->copy_from(temp);
-		}
-		else
-		{
-// Never happens
-			BC_CModels::transfer(frame->get_rows(), /* Leave NULL if non existent */
-				temp->get_rows(),
-				frame->get_y(), /* Leave NULL if non existent */
-				frame->get_u(),
-				frame->get_v(),
-				temp->get_y(), /* Leave NULL if non existent */
-				temp->get_u(),
-				temp->get_v(),
-				0,        /* Dimensions to capture from input frame */
-				0,
-				asset->width,
-				asset->height,
-				0,       /* Dimensions to project on output frame */
-				0,
-				asset->width,
-				asset->height,
-				temp->get_color_model(),
-				frame->get_color_model(),
-				0,         /* When transfering BC_RGBA8888 to non-alpha this is the background color in 0xRRGGBB hex */
-				temp->get_w(),       /* For planar use the luma rowspan */
-				frame->get_w());
-		}
+//printf("FileList::read_frame frame=%d temp=%d\n",
+// frame->get_color_model(), // temp->get_color_model());
+		frame->transfer_from(temp);
 	}