X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Ffile.C;h=76cb743f93f46e6efd525360fa27b5959120cdc6;hb=243336668c89096732786c6b3f3c5918aa2eff26;hp=4b9c1be85a5ccc60c4544442de152593834e2b7b;hpb=9d832a1fff11b11aaa1108c460690ed05e2bdc05;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/file.C b/cinelerra-5.1/cinelerra/file.C
index 4b9c1be8..76cb743f 100644
--- a/cinelerra-5.1/cinelerra/file.C
+++ b/cinelerra-5.1/cinelerra/file.C
@@ -1146,7 +1146,7 @@ int File::read_frame(VFrame *frame, int is_thread)
 		}
 
 		if( !temp_frame ) {
-			temp_frame = new VFrame(asset->width, asset->height, supported_colormodel);
+			temp_frame = new VFrame(asset->width, asset->height, supported_colormodel, 0);
 		}
 
 //			printf("File::read_frame %d\n", __LINE__);
@@ -1317,12 +1317,10 @@ int File::bytes_per_sample(int bits)
 }
 
 
-
-
-
-int File::get_best_colormodel(int driver)
+int File::get_best_colormodel(int driver, int vstream)
 {
-	return get_best_colormodel(asset, driver);
+	return file ? file->get_best_colormodel(driver, vstream) :
+		get_best_colormodel(asset, driver);
 }
 
 int File::get_best_colormodel(Asset *asset, int driver)