From: Good Guy Date: Sun, 5 Dec 2021 22:41:57 +0000 (-0700) Subject: minor improvements from Andrew X-Git-Tag: 2021-12~8 X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=commitdiff_plain;h=d8ce2345fd2aff5f329056474b442fa810848f42 minor improvements from Andrew --- diff --git a/cinelerra-5.1/cinelerra/vrender.C b/cinelerra-5.1/cinelerra/vrender.C index be3d0c3b..03b1421d 100644 --- a/cinelerra-5.1/cinelerra/vrender.C +++ b/cinelerra-5.1/cinelerra/vrender.C @@ -70,6 +70,11 @@ VRender::VRender(RenderEngine *renderengine) asynchronous = 0; // render 1 frame at a time framerate_counter = 0; video_out = 0; + track_w = track_h = 0; + output_w = output_h = 0; + first_frame = 0; + output_offset = 0; + source_length = 0; render_strategy = -1; } diff --git a/cinelerra-5.1/guicast/vframe.C b/cinelerra-5.1/guicast/vframe.C index 44d7f97e..8e90cca1 100644 --- a/cinelerra-5.1/guicast/vframe.C +++ b/cinelerra-5.1/guicast/vframe.C @@ -1403,12 +1403,12 @@ int VFrame::get_memory_usage() // a (~alpha) transparency, 0x00==solid .. 0xff==transparent void VFrame::set_pixel_color(int rgb, int a) { - pixel_rgb = (~a<<24) | (rgb&0xffffff); + pixel_rgb = (~(unsigned int)a<<24) | (rgb&0xffffff); int ir = 0xff & (pixel_rgb >> 16); int ig = 0xff & (pixel_rgb >> 8); int ib = 0xff & (pixel_rgb >> 0); YUV::yuv.rgb_to_yuv_8(ir, ig, ib); - pixel_yuv = (~a<<24) | (ir<<16) | (ig<<8) | (ib<<0); + pixel_yuv = (~(unsigned int)a<<24) | (ir<<16) | (ig<<8) | (ib<<0); } void VFrame::set_stiple(int mask) diff --git a/cinelerra-5.1/thirdparty/src/libbthread-master.patch1 b/cinelerra-5.1/thirdparty/src/libbthread-master.patch1 new file mode 100644 index 00000000..f92be134 --- /dev/null +++ b/cinelerra-5.1/thirdparty/src/libbthread-master.patch1 @@ -0,0 +1,9 @@ +--- /dev/null 2021-05-22 06:52:04.572000000 +0300 ++++ libbthread-master/Makefile 2021-05-23 15:06:41.348461769 +0300 +@@ -0,0 +1,6 @@ ++all: ++ mv pt-test.c pt-test ++ cat `ls *.c` > just-pt.c ++ g++ -c -o jpt.o just-pt.c -I. ++ ar crs jpt.a jpt.o ++