projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
terminate keyframe string in edl output
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
filepng.C
diff --git
a/cinelerra-5.1/cinelerra/filepng.C
b/cinelerra-5.1/cinelerra/filepng.C
index 0cb6445bec64c6c0f7ffd186085925735499313c..d4b581d7f0f9f40bda46305f6728a806976963c9 100644
(file)
--- a/
cinelerra-5.1/cinelerra/filepng.C
+++ b/
cinelerra-5.1/cinelerra/filepng.C
@@
-77,10
+77,8
@@
int FilePNG::check_sig(Asset *asset)
void FilePNG::get_parameters(BC_WindowBase *parent_window,
void FilePNG::get_parameters(BC_WindowBase *parent_window,
- Asset *asset,
- BC_WindowBase* &format_window,
- int audio_options,
- int video_options)
+ Asset *asset, BC_WindowBase* &format_window,
+ int audio_options, int video_options, EDL *edl)
{
if(video_options)
{
{
if(video_options)
{
@@
-216,8
+214,8
@@
int FilePNG::write_frame(VFrame *frame, VFrame *data, FrameWriterUnit *unit)
native_cmodel = asset->png_use_alpha ? BC_RGBA8888 : BC_RGB888;
if(frame->get_color_model() != native_cmodel)
{
native_cmodel = asset->png_use_alpha ? BC_RGBA8888 : BC_RGB888;
if(frame->get_color_model() != native_cmodel)
{
- if(!png_unit->temp_frame) png_unit->temp_frame =
new VFrame(0,
-
-1, asset->width, asset->height, native_cmodel, -1
);
+ if(!png_unit->temp_frame) png_unit->temp_frame =
+
new VFrame(asset->width, asset->height, native_cmodel, 0
);
png_unit->temp_frame->transfer_from(frame);
output_frame = png_unit->temp_frame;
png_unit->temp_frame->transfer_from(frame);
output_frame = png_unit->temp_frame;
@@
-384,7
+382,7
@@
PNGConfigVideo::~PNGConfigVideo()
void PNGConfigVideo::create_objects()
{
void PNGConfigVideo::create_objects()
{
- lock_window("PNGConfigVideo::create_objects
()
");
+ lock_window("PNGConfigVideo::create_objects");
int x = 10, y = 10;
add_subwindow(new PNGUseAlpha(this, x, y));
add_subwindow(new BC_OKButton(this));
int x = 10, y = 10;
add_subwindow(new PNGUseAlpha(this, x, y));
add_subwindow(new BC_OKButton(this));