projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yuv colorspace/range + prefs, ffmpeg colorrange probe, x11 direct force colormodel...
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
file.C
diff --git
a/cinelerra-5.1/cinelerra/file.C
b/cinelerra-5.1/cinelerra/file.C
index 4b9c1be85a5ccc60c4544442de152593834e2b7b..76cb743f93f46e6efd525360fa27b5959120cdc6 100644
(file)
--- 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 ) {
}
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__);
}
// 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)
}
int File::get_best_colormodel(Asset *asset, int driver)