From cdb8b00f2f7ecf0b4910a40e1d90a87540d2891d Mon Sep 17 00:00:00 2001
From: Good Guy <good1.2guy@gmail.com>
Date: Thu, 5 Sep 2019 18:27:29 -0600
Subject: [PATCH] repair vaapi encode_frame, fix segv on unreadable asset,
 update crop resource icon, update info text, i386 patch for dav1d

---
 cinelerra-5.1/cinelerra/awindowgui.C          |   3 +-
 cinelerra-5.1/cinelerra/ffmpeg.C              |  20 +++++++++++
 cinelerra-5.1/configure.ac                    |   4 ---
 cinelerra-5.1/info/plugins.txt                |  29 ++++++++++++----
 cinelerra-5.1/picon/cinfinity/crop.png        | Bin 0 -> 13184 bytes
 cinelerra-5.1/picon/cinfinity2/crop.png       | Bin 0 -> 10118 bytes
 .../thirdparty/src/dav1d-0.4.0.patch1         |  32 +++++++++++++-----
 7 files changed, 68 insertions(+), 20 deletions(-)
 create mode 100644 cinelerra-5.1/picon/cinfinity/crop.png
 create mode 100644 cinelerra-5.1/picon/cinfinity2/crop.png

diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C
index 091fd140..66e69c3b 100644
--- a/cinelerra-5.1/cinelerra/awindowgui.C
+++ b/cinelerra-5.1/cinelerra/awindowgui.C
@@ -121,8 +121,7 @@ VFrame *AssetVIcon::frame()
 {
 	AssetVIconThread *avt = picon->gui->vicon_thread;
 	Asset *asset = (Asset *)picon->indexable;
-	if( !asset )
-		return *images[0];
+	if( !asset ) return vframes()>0 ? (VFrame*)*images[0] : 0;
 	if( !asset->video_data && audio_data && audio_size && length > 0 ) {
 		if( !temp ) temp = new VFrame(0, -1, w, h, BC_RGB888, -1);
 		temp->clear_frame();
diff --git a/cinelerra-5.1/cinelerra/ffmpeg.C b/cinelerra-5.1/cinelerra/ffmpeg.C
index 6d1f535b..70098ca1 100644
--- a/cinelerra-5.1/cinelerra/ffmpeg.C
+++ b/cinelerra-5.1/cinelerra/ffmpeg.C
@@ -1252,6 +1252,26 @@ int FFVideoStream::encode_frame(AVFrame *frame)
 		frame->interlaced_frame = interlaced;
 		frame->top_field_first = top_field_first;
 	}
+	if( frame && frame->format == AV_PIX_FMT_VAAPI ) { // ugly
+		int ret = avcodec_send_frame(avctx, frame);
+		for( int retry=MAX_RETRY; !ret && --retry>=0; ) {
+			FFPacket pkt;  av_init_packet(pkt);
+			pkt->data = NULL;  pkt->size = 0;
+			if( (ret=avcodec_receive_packet(avctx, pkt)) < 0 ) {
+				if( ret == AVERROR(EAGAIN) ) ret = 0; // weird
+				break;
+			}
+			ret = write_packet(pkt);
+			pkt->stream_index = 0;
+			av_packet_unref(pkt);
+		}
+		if( ret < 0 ) {
+			ff_err(ret, "FFStream::encode_frame: vaapi encode failed.\nfile: %s\n",
+				ffmpeg->fmt_ctx->url);
+			return -1;
+		}
+		return 0;
+	}
 	return FFStream::encode_frame(frame);
 }
 
diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index 14e03257..20b82948 100644
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -473,10 +473,6 @@ if test "x$I86$X86" != "x00" ; then
   rm -f conftest.asm conftest.o
   REQUIRE_PROG(YASM, [yasm])
 fi
-if test "x$X86" = "x0" ; then
-  # incompatible instruction set
-  PKG_dav1d=no
-fi
 
 ## end arch dep tests
 
diff --git a/cinelerra-5.1/info/plugins.txt b/cinelerra-5.1/info/plugins.txt
index f19a16de..acd422f8 100644
--- a/cinelerra-5.1/info/plugins.txt
+++ b/cinelerra-5.1/info/plugins.txt
@@ -58,6 +58,7 @@ CriKey:		Regionally based chroma key with interpolation;
 		.    Alpha - matching pixels replaced with see-thru.
 		.    Edge to just outline the edges of the region.
 		.    Mask - matching color pixels replaced by black.
+Crop & Position: Allows for cropping and positioning the input video.
 Decimate:	Drop frames from a track which are most similar
 		in order to reduce frame rate.
 Deinterlace:	Several selections of line replication to eliminate
@@ -110,6 +111,7 @@ Linear Blur:	Blur with parameters of length, angle, # of steps,
 Live Video:	Reads video directly from the capture card input and
 		replaces any video on the track.
 Loop video:	Loop video by specifying the length of the region to loop.
+Mandelbrot:	Render a Mandelbrot fractal using Cuda.
 Motion:		Tracks translation and rotation motion to stabilize
 		shaky video.
 Motion 2 Point:	Motion stabilization using 2 pass tracking.
@@ -135,6 +137,9 @@ MotionCV:	Motion tracking/stabilization from the community
 MotionHV:	Motion tracking/stabilization from the original
 		author of cinelerra.
 MoveObj:	Move and stabilize object using OpenCV 3rd party pkg.
+N_Body:		Simulation that numerically approximates the evolution of a
+		system of bodies in which each body continuously interacts
+		with every other body using Cuda.
 Oil Painting:	Makes video tracks appear as a painting.
 Overlay:	Combine tracks via an overlayer that puts images on
 		top of a bottom layer.
@@ -233,12 +238,13 @@ F_bwdif:	Deinterlaces the input image.
 F_chromahold:	Turns a certain color range into gray.
 F_chromakey:	Turns a certain color into
 		transparency.  Operates on YUV colors.
+F_chromashift:	Shift chroma.
 F_ciescope:	Video CIE scope.
 F_color:	Provide an uniformly colored input.
 F_colorbalance:	Adjusts the color balance.
 F_colorchannelmixer: Adjusts colors by mixing color channels.
-F_colorkey:	Turns a certain color into
-		transparency. Operates on RGB colors.
+F_colorhold:	Turns a certain color range into gray.  Operates on RGB.
+F_colorkey:	Turns a certain color into transparency. Operates on RGB.
 F_colorlevels:	Adjusts the color levels.
 F_colormatrix:	Converts color matrix.
 F_cover_rect:	Find and cover a user specified object.
@@ -249,6 +255,7 @@ F_datascope:	Video data analysis.
 F_dctdnoiz:	Denoise frames using 2D DCT.
 F_deband:	Debands video.
 F_deblock:	Deblock video.
+F_dedot:	Reduce cross-luminance and cross-color.
 F_deflate:	Applies deflate effect.
 F_deflicker:	Remove temporal frame luminance variations.
 F_dejudder:	Removes judder produced by pullup.
@@ -278,8 +285,8 @@ F_drawgrid:	Draws a colored grid on the input video.
 		thickness of the lines.
 F_edgedetect:	Detects and draws edge.
 F_elbg:		Apply posterize effect, using the ELBG algorithm.
-F_eq:		Adjusts brightness, contrast, gamma and saturation.
 F_entropy:	Measure video frames entropy.
+F_eq:		Adjusts brightness, contrast, gamma and saturation.
 F_erosion:	Applies erosion effect.
 F_fade:		Fade in/out input video.
 F_fftdnoiz:	Denoise frames using 3D FFT.
@@ -310,6 +317,7 @@ F_il:		Deinterleaves or interleaves fields.
 F_inflate:	Applies inflate effect.
 F_interlace:	Convert progressive video into interlaced.
 F_kerndeint:	Applies kernel deinterlacing to the input.
+F_lagfun:	Slowly update darker pixels.
 F_lenscorrection: Rectifies the image by correcting for lens distortion.
 F_life:		Generate a life pattern.
 F_limiter:	Limit pixels components to the specified range.
@@ -322,6 +330,7 @@ F_lut3d:	Apply a 3D LUT (look up table) to an input video.
 F_lutrgb:	Compute and apply a lookup table to the RGB input video.
 F_lutyuv:	Compute and apply a lookup table to the YUV input video.
 F_mandelbrot:	Render a Mandelbrot fractal.
+F_maskfun:	Create Mask.
 F_mcdeint:	Applies motion compensating deinterlacing.
 F_mestimate:	Generate motion vectors.
 F_metadata:	Manipulate video frame metadata.
@@ -335,10 +344,9 @@ F_noise:	Adds noise to the video.
 		select the variables of the noise
 		(strength, flag and seed).
 F_normalize:	Normalize RGB video.
-F_owdenoise:	Denoises using wavelets.
 F_oscilloscope:	2D video oscilloscope.  Useful to measure spatial impulse,
 		step responses, and chroma delays.
-F_owndenoise:	Denoises using wavelets.
+F_owdenoise:	Denoises using wavelets.
 F_pad:		Add paddings to the input image, and place the original
 		input at the provided x, y coordinates.
 F_pal100bars:	Generate PAL 100% color bars. This only works with RGB 8-bit.
@@ -352,7 +360,6 @@ F_pp:		Filters video using libpostproc.
 F_pp7:		Applies Postprocessing 7 filter.
 F_prewitt:	Apply prewitt operator.
 F_pseudocolor:	Make pseudocolored video frames.
-F_rgbtestsrc:	Generate RGB test pattern.
 F_readeia608:	Read EIA-608 Closed Caption codes from
 		input video and write them to frame metadata.
 F_readvitc:	Reads vertical interval
@@ -360,6 +367,8 @@ F_readvitc:	Reads vertical interval
 F_realtime:	Slows down filtering to match realtime.
 F_removegrain:	Removes grain.
 F_repeatfields:	Hard repeat fields based on MPEG repeat field flag.
+F_rgbashift:	Shift RGBA.
+F_rgbtestsrc:	Generate RGB test pattern.
 F_roberts:	Apply roberts cross operator which performs a simple/quick 2-D
 		spatial gradient measurement on the video (usually a grayscale
 		image).  It highlights regions of high spatial frequency which
@@ -367,6 +376,7 @@ F_roberts:	Apply roberts cross operator which performs a simple/quick 2-D
 F_rotate:	Rotates the input image.
 F_sab:		Applies shape adaptive blur.
 F_scale:	Scale the input video size and/or convert the image format.
+F_scale_cuda:	GPU accelerated video resizer.
 F_separatefields: Split input video frames into fields.
 F_setparams:	Force field, or color property for the output video frame.
 F_setrange:	Force color range for the output video frame.
@@ -388,6 +398,7 @@ F_super2xsai:	Scales the input by 2x using
 		the Super2xSal pixel art algorithm.
 F_swaprect:	Swaps 2 rectangular objects in video.
 F_swapuv:	Swaps U and V components.
+F_tpad:		Temporarily pad video frames.
 F_tblend:	Blend successive frames.
 F_testsrc:	Generate test pattern.
 F_testsrc2:	Generate another test pattern.
@@ -412,6 +423,7 @@ F_waveform:	Video waveform monitor.
 F_weave:	Weaves input video fields into frames.
 F_xbr:		Scales the input using xBR algorithm.
 F_yadif:	Deinterlaces the input image.
+F_yadif_cuda:	Deinterlace CUDA frames.
 F_yuvtestsrc:	Generate YUV test pattern.
 F_zoompan:	Applies Zoom & Pan effect.
 #
@@ -436,12 +448,15 @@ F_aintegral:	Compute integral of input audio.
 F_allpass:	Applies a two-pole all-pass filter.
 F_aloop:	Loops audio samples.
 F_ametadata:	Manipulate audio frame metadata.
+F_anlmdn:	Reduce broadband noise from stream using Non-Local Means.
 F_anoisesrc:	Generates a noise audio signal.
 F_aperms:	Set permissions for the output audio frame.
 F_aphaser:	Adds a phasing effect to the audio.
 F_arealtime:	Slows down filtering to match realtime.
 F_aresample:	Resamples audio data.
 F_asetrate:	Change the sample rate without altering the data.
+F_asoftclip:	Apply audio soft clipping - a type of distortion effect
+		where signal amplitude is saturated along a smooth curve.
 F_astats:	Shows time domain statistics about audio frames
 F_atempo:	Adjusts audio tempo.
 F_atrim:	Pick one continuous section from the input, drop the rest.
@@ -458,6 +473,7 @@ F_crossfeed:	Apply headphone crossfeed which blends the left and right
 		order to produce more speaker like sound.
 F_crystalizer:	Simple Expand Audio Dynamic Range filter.
 F_dcshift:	Applies a DC shift to the audio.
+F_deesser:	Apply de-essing to the audio.
 F_drmeter:	Measure audio dynamic range where setting window length in
 		seconds is used to split audio into segments of equal length.
 F_dyaudnorm:	Dynamic Audio Normalizer.  When using this plugin,
@@ -507,6 +523,7 @@ F_treble:	Boosts or cuts upper frequencies.
 F_tremolo:	Applies tremolo effect.
 F_vibrato:	Applies vibrato effect.
 F_volume:	Change input volume.
+F_volumedetect:	Detect audio volume.
 #
 # audio plugins
 #
diff --git a/cinelerra-5.1/picon/cinfinity/crop.png b/cinelerra-5.1/picon/cinfinity/crop.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c67bb5847895d82371e110dae711a143012b154
GIT binary patch
literal 13184
zcmeHsWmKEn)-G<vo#GCqA;I0fK+)o~1PC4^xE7ZdZ*hkL#VJm)B1MX8fC5E|6^eV2
zn|AMS@1A?lJ>NZJ-0$B>Mn<yc`^;y}^}KVgm3OTu&Bsc3IQMaokdW|Hl;yP%-$Fk>
zSQto1$X^y#$B>XH-udVnxM_nu8JuBGR<;fh1~+eK2m{2+)(Q#9YrZ1G7WP#*zWi>D
z)D_JfGd5(}!SNtgDktRiYi*VKI*Ah1v;mfP@?KtENH(>%U+x@_rLNz+&cx<P(bai>
zfi0j5_tL5Su^CXWFZ_HoZgkZ1?AZPIHf${so^{?=m;HkpzSf5-A`bttxx*G$oOQ&1
z;&(Wct3MhmbVK!ZGT!st{fD36sdr^q%C`6&td;(Jk7_t&l+hxZ%63$2ExGD?@Ek9j
z=wg@pdDU@>b@n;@81C;Rc6@vG@^I;k|GUNM?48?M&Y`4i>In*J2{`n6$)iuUin)ef
z;`x<1)VLC!L-F~$#Ng6Sw&^`=Rn}v*Z_o#uv_j@n%cB-iUxqsRfA|G(b%b%^iwjl-
zp<W3@SImHip&?lfb5OW9tp})QIeD;ER47vl{$jN9y-OzXiGAZ>`<1O<r#@<jH+ReV
zyV*%6i5omNkt*BfNyGcK;)jD(mwT(vFa4ctoMaZ}%UVCba1qH12lu;P4Vnt~?DZ8L
z&YoYVQ!JPOV^6(6bbJ(Svy}lt;{`V#lBEL97AUIBD#iF6vNcdsBiorn-q8`53|!f~
zYO8UbGukyc(6IPAf(btij2TzA7i>S2T*+LW5*oGi-E$vbOvxjsA@XPP!lAPh<_g6M
zfN_|;RiF=v;wehCh!SY{s-sMl{z-*qx@MHIFB3Mx3SW2u%<D;f#9cTwQCdca^HN~i
z!LFpfL9sZdh+0Ev&!(bf&v)xxaklSveIv4;BBjfl1SKl>y6vKz&^tB03`46d=p6cM
zJp-4*Bz;5odc2v2FW|l`k0l6vajEUh>$DcWOEG%0WPf&;E>1q;f7xwsGICjg%_SOj
zL`CP?xqA4J0Lg|u$Mj?P@>h||-O||HNc^ffj!iYLxRuW8@|U06f9!R;cAREJt>j#9
z1RP~1?A$*08tHeB+YC7UEc7(vlkb|>ZmjIw$q}{rTKJQ6E_IP@I9!mTt*2Q#gGw|?
z;37%Uo;9{%W?BgcKHG~vjQY3=sqNz)y9JJ*yYX7RKgVK2Iyu7u<@2~{<1g?L^v})N
z?2h><W9kN-#S^~t-J(b8b8Qe+AQzm-^>O{>liEUs(=@gm>QK012Wd7W$xMmmr6mZh
zt+L@dIY@EI{=9W1bG;fySIMo|#O92PTM59(KD5GSHf4<NG<&~N>AoI*=L@a;w!Mq`
z7}qa-ouc+5kAIAbXFbM6(5)}6d&a~zabJCwQKO4uZ?p=Ida_pJuDO!Rz^J)r9TB<t
zg?P3U!E-7_DN|HpF+m|@i|RRooSAg@7=_ra1hcZpocK=<p_pCap^5s@@F9uICmt`^
z>I6*R)|k_W4LrzV;4B@?75pr`z#S$Y64eRr+jB%#uhAv2JtI?1>q!}KMPbb^eds`<
z)ZaiNfEtHkB9hfT;R@BxwvRqHO1^kJ*b)zO0i8s*vub-pUbAN%7weDhxvDcBJz^FS
znKcS3>s$-a_wAWtbqw#&0ZQ(s9i`V=BkiJCp$PbzCmC&KqN(W&Qu;sRxlj~_@_%I!
z-%OWyINM&26VB7SzH{IRX78{c0t@A+_NZFMCddfMtE;}kt$6b#t5etuj0fhd;9#W~
zb-O*B-ilFHM0ywsi-n@D)Lab}b}5ABnvfI2Mw&^Jt_bl^4Gv=*kJjc>R6+%v&r2{G
zqc+Ng7K3gcc^O-6Nk2o4b>DcXJ<whG=rNiULrdd(ZX`?M;3BoLd$Cbc2~<a@S=f2q
z6>U4=>gB+EH-UR8L$TC)cm-8~$k@mA2?B-;d;V8+eCgIG@nV$|o|=SG()`nGPXUh~
zqT|XNuN2_SnLzQH>Fbgj1XqGIQLM)Z+BP2<$V{YP8JMs+fS`-|kaE`q?S3Zljl7Lu
zIXId;!;kd*hPmJ{rvqU&bz>3?mb`+8{n~G%CD`@A*GQ#QU8TaS7AS0^EyB%w{Hl^&
zV@f?;vT?6&5`DSm%*Jxq&HTYe)vCOja`;hbdM#X>k4ITnaKg16tb;3e1$d7n_mMf{
z@n-0<O>zfBI3#$88WYFgvZKk8%K4%pVUs^6!HfACb{M;UcWu{hVs>_5hKWlks2;AO
z5;RcCLcZ`E8feE{V*f1F{i1!@InbuR<W=T-67M){ULN+5^I0mERYn4Tv(9hkV4P1>
zv_rD_c!i2cy2N4iAB7hUkU2>4^e|}!B1RjNXuYUCl|tBN%gq-B&L6c9XA$`fHdH>H
ziA4=BZ-|Se8=AP^ZU|?<Bemiv8|Pr;N7;2RdaCL@nCAR7*R$GDC5_{GVVP0HF#b`?
zF5_jOl>QE?u|Y1X?goq3z(aSoZ6wb0$mlp_)Uc_1@*tPo8$2n_@H9yu41i8q#%#^2
z+L=%ow`u^xZJvDUj7DO4)6G0C38p@pZyxglbGs1Hns!vDP@Jf+*U~J{EVHSWUx>@8
zvAYz}Z1g5E*gK6cau0Asyv7x;=ov|>);+Y3%CIs>eR*#n`0H*^>gTyiS@PU!7e}!)
zy6xaCo^LB%h0*avw4v^dc@OH4H*tIBDx+SiZk?bl!ivW_<Cc5#2zyPi)cQL(yU(M-
zpY+C1mrNx@u`Kh<m~UCi<bHslFw3oEa|D5*@*myq&ceL!*!DGa*e$ryiAU(Z%zg}j
z&RtKOXaG7IeyFB+WJuv%Iw?7{pS;lS{1M{zEr{7m=EDUwS5?!vFInQn{o?Wk3gLOU
zyjS2{GV^<(2Nm(iE)-7`kvmzQ;TQ?yOI!9!O%nU`KFSJQ0?1I{!6+~EHoF2(by&19
zm>c5gWSIyZ@cfP)>hopnO1DYcmG<HM%1tqrR*7o>o@Mh&rDUX@DM~f6@A;F=r;99C
zY@Ue)q@rUY4956NP7~^MhG6lD(bM!7Vto0O5t~t1wgx!zNo1DCF`e(fGN{P_w6<tO
zWeb2BbMeYQ6x*qjopU1BB>}T0Am9tEqxr3*GHt07?9;s0wn+DPhu+!Ov+9gZnNsgs
zohWC9BFQ9(eH0{JJJ+Lm#xf#cu8n3w_oNJtJ*x7N7d<83uG_wu(K{qDsOLQ~r#E(l
zJk1W)m8v~`h#$5>xO0y+f&0EVIK1F+av1=N50!CI!(cMCb~BTi5mJiK3S-jnjS0-8
z@0PqVz@peF{L1h>F-f!N*1u=Ny+0wDYE&T!)#OZ;-`F2+n<p+|0-x+lp^JY1A-BT=
zc7EXcqpD)E;j$6?T0G#`8->)9ucC|v&<Z6j53B6Ic-@C}9H|tflU<D3WGB0DLA8}z
z3ng>=6ci*ecG!hyvD0yrkIzQ_=8oIncF*Zarb(Ee_6MmbpJ$|R#^WkbJR1|O3m<u4
z6}S~5ojzDxwIL=_;2&R!fl<hVIKWSCF%m@-o0(99OdJIiH(t_Na?-H#bagx!2xing
z=<;mGtruW@dHgz!^!`-%8&Vu7Z-zm}M3AU}I#xNVtOie!Lo2XR>y^c)hUj2@JENKt
zmLdk94a`m+&6ler>V!M0S^-r^(lF!-t+Y7*7veoO#!38SWcE5MX-3<xDOqSei$0>=
zXT<NsNaRQF(cXW<RgxK0PD4sOaQNZFE!8$=rb*Wwn3gb?6Db4QRv>auIX|^)--Bd~
z6zZ%K)<d*Qkxm^DB*va>x{?2SF|q_lP_(>h^GVV@batzV@?nSqY0mdoyz||M7j0T`
z#9Os1%TW`uF(4Zp6|+bwf&A}dmFy0IOvEvMAk(Fata6Q_WdbD6WGhd7<v<vQ6_$7C
zTCSs_lO;cy0+b;qRE9WTRy3Ir_#I7QlPK@;6sJE*6A8hpO;7CjL(Ov4vVxX%5|siq
zK;L7k3iG0EGIz!-;%wM!%C?)MqqhrH#iO-oYd0sS>z6s%0o$|J_M=kn4!8Bz?wN(j
zKMbdXY$e`Xu}u2E9$m!~(ugj{A7t5Las-s>$!6G}UbsD-=zuCf+?9!a*0_RtZGLo8
z9D4b8o;gWr!*J13AuM6D^3tcYcmm{6dR)p3?+xP&JOi;`$oaY$TS|Y8Fjbz%ZQUf4
z<s{wCi*X@x=k|1-=CtDw=Ugp-(W9F_FXSt&6VVRg?Na*ma7)=sTBV+jS4@S>d`)k0
zB(?h$Kqx)Dh9ECsvPbkSK7OgX9XO$xCAF>^RnNLeJFr$Y-kk#N)w*8J2DX?aBlGo#
z%<qCHq-95Xj?HUZ5-%FWO3%<HXce*Qh}Jy843I~4m=7SIK(_rMxuG|?=~jZ*M?6*3
z(KX#`j8^BK`osH9v7c;i$t<>HUL>lkbOk=(Lmwh)$;e&{tnSA=Lw}mG17hJsu_D`h
zJa*#CdmO%W+U$E=rQ=0kMp4*=ap4Ppq4$Q8{k(Lji0Ru~(^dCed96yMZ3$p-qh`m`
zDYg~YVZY``*(U-_kv&3@G@<epD=t9RFHOD8jJ`No-`{p41v66cI3C?<$hQ=(E=38p
z<_-JH8gFf&I|j2h)MF?3;LI`K)-aG!6f!V8XgOgbOq%?TOk_~{Ho*v9AkyZb($o5F
ztfRxKy@e9{i=|XSgqnuU*<41AtV0^V@On2H)d~!w>5?Ugw2x{p-zGH-$i5*D6w<P3
zz<jO#qlDc${;6C*G4_D|@#4q*s_Ai}9+nEqkuAa-qwH!kK6rSH-&>nJGk;lAI6-`<
z9|JLm?nKJV;`LGZP@h8RRnwz0`S6<kt;G(Rx7-zl(4<wgPibsezU@WGin$*}rQPv#
z7pQ$=1?qf}a+x@c?sbg>MHb-n4b>Pn6>xLph18}GD=GHPpw=@y5FMW$eKv(PXO$`P
zHTg{WY=QWr9((F2UY6U*aOhpP!13_MEPpBN!z{<MFzR&$$pI|s67`CP#&sfcn?y@1
zVV>hRQt%eN7<nQ-9kG{5Q5AvX+$Yoa54<;D|42tX`vBo%Uix@UIm-9nd|)}zlNm&5
zL>BdN!<buw)w(>7$=&FZ3cYX6zgH_3BadbLl4o_z7|BETRK<;x06Icw`xGL#14Md(
zDdl{Innx|Ye=t6=9M$THH4c1mODn%mI6)VenAXh5f2{18^|i7Ji-=k?Yu;y)^xgB?
zv2+e>c(xh;-hRPZBYbF3L9$Z6CMeTM`c)wv(=DN<NN26?p|O~z3Gc^tW)2*FX1YtZ
zlO7idTvp<l<gqvrOX%^Ug6U@`cqxum@2rLRJ){IX_OB)ku!`b@9;A218@uDU-<oC*
z=stpTKR8S$dnL_M9Ka_YeMvmAzZ53KQA6>Nc;)XkZ5%>_@~lwv(}HM8GxNy^P7mPi
z(^A?VyNsS^B2iGOAr>>no8Yt19+Q`1vPI%eK1853<f7#G>rxLNhx;H{(rLaP*Y1D~
zOPv?m4<b#LF=~YyKJgy{Za7`RZ!BPy1(#@VcLsb3bC4jJMUxcCkE}a=J!)7K)E1Iz
zL>E(wlE1fWm%fg{kkI6iiE0~YIX$wLH{IdPAd+C41K4P(Z<5ce1G!9yk2Sjjyr0U*
z-5XuoXxWUSuXoPY=NbRxX>lQrcKoI9z#D6$BM#YGGp1duMkI4#y#`k06MBGUM&`@I
z4<*P>>Se5W?JFvV+D2-rik|1mTU;bjH<j67={$Yk%!6t3tFE1)sOMmDDEZa|F5!Yt
z{Ac|($zEtXZl=e>>H2f~F~{61G)|VNhw<<I^uo8-b}zpsCVLQ3C967nn1XG)Q!vDN
zk(2H*RL##{W0BI*HgjEru$JFUcnSmx8B^+&g@v;O;=790O9$zB)9(`N#PJ4?<}q-E
z7i21i>b?+r#4NfHrz^Ss+PLxw3D%WKR+3rzftVaT!1(E8iKr|WIDu@Ztrye6CTg_4
zT-~Zw{>1_7j1jJ36lbD$kzmi%Zg`1GS~EN`K4QtZBFZaW4(rgbpY#T<dK8;e;^BX}
zaZKTSFwx70&fF`JTXC6u#1#2d%~v}G7j8Vx)>|3hI0$JDd=T0smnW|JI(aUejBE?V
zG+5cg>?_g0K>~AOuEdHbK-VV4LAuOVdu&TwTgOGvEp^%4(p0#FW9xxr>G21vZtw6b
zHQ{@t^&yV^Y++Yg&y2r3W+Wi)G#dB$QKOxJ8{GPZH)o*W>Jhd3>o@NtUm{5^GE$eH
z362WrYiI}s+Y>Zawzw^?n$&V!vnp7oPY9_Aj?v1B+|GKwpfjqQ>`%X2)XYvuy%CH*
z2e%TeLb04sFSc$omWH=)_paki<(5RW&5lLtfv-To;pkvu<n*Y(X~p+F5m${`8Nr{(
zOS$@8pllH|-vUYA$yr3Y6#xvgR!UWN2%rg*y=ORZ1zH0z?Y9!G@)iqwxL1hg<%v7W
z#xZUUxd?L{aXD5E@wB_#5lcq>k`CWUNX|01Zxd`il^_|{20XTT5H5yNI^^YMdQz4!
zg)OEUN?MVVxEI{=q6*H)$a~#4UvXJi`f`Cuj?IaRVk(S1<MBt~uUV76pPr=z#}tmN
zmeggX%(7}l*w$HlXqB>;_Qcn%Ewqr4@s5&TjRlx-&zp5R-|I}MYrww~)o7Dn7*4c0
z9<X`kCHMlZ36ezFIIHye8|wDffsh|F=7?}+LtA~CA(x@dQ0vj0n09EocMyK&2V5TY
zrd}h_RHbpFT0!hhL)ZA!9yQ%h^I5@I<l{Uw!1*7ExOf{0`cBc&56iI0^X@|)6Wc#g
zdSD$LH=Fj>X6FFcfD=Nbe3r@2D=*j9{XPd&&b9PJtNml}baQzz9<BYDWc!HMmK&ak
z(9R{koTh9bNJ=xO@eJkWmg?!m(o#0cSMnU;D&@hBr`_Ds3y=hliz{0as`HuB8On~9
zs}lCxY>(k*ZfEsX8f(vY2CoO}m<G&ND@?z9Yci^>d~b*=__(6#bz+rh0vIkiAosNb
z6(yucR~E$(k09J!RfOc5fZaOjgLm3VOVMGk-cLPkjw45sm=KQYve!Y5$?J9^#^i$6
zo-NngeK|IIp#{)=S(0Z2!#<I{!q%5*{Z{A9{f*20T<<1Nae-3Q>uZ<x$TeCkX;2n+
zQn(LlR*Xr(E3%+e1`Xfn9iyoLlT(rLmrAuHgYMy0zS}A>?vGTh%Q}X}>LgSQ2Y?A*
zqGTN$3$ZS==9WDwuMg!^DRaj=xv1V%#g;#28?t9mOz3s8w$6-YGTpq!5tZznrX?f(
zKr8yPwl1~9P4=1wWT*e82&&gN={5nE@J$kFP|ihD3C)#DyeB&0f)Q!W|8`fBI8}-z
z_`DJQdjJv98g?=L{*N{225`T{X)<kKucS5b0o#{@^g$J>w^TpmrFGCW-$=b=w>G?4
zYDYCg4i9q^OSAidCNUr5f59?Yf>mG=Cp9E3w!Inh7%*41rG|#%L?fu=J4eWt&&k-x
zCBm_7xoAReh~qOa^6YyJesF$iTY*p6Jf4oADxqzd(dNdzH!kB7#%&*L3v&xTv9U(G
zR_|w07hG@}V(R$spLb>%EdrIw^YOoeRD^h&0k0Oz$Ir;MDS111_#dKZtyHOBy`LPC
zGoB6lDo|`!p)TGK#KzWqe!s5lnKJT*1K0I;#)AE)d<T!2sh(Trm1=$S6!R-SVy>lK
zbh@EoE|$kH<1xb;SW~2p+T+|(x0L6IF{erb6UylQU=n?=g!gzO4}^|&BcE_)V3%!~
zY^oi~Vv6}~N{|8IWk^#$Pkl8%rtxTEu1467=aHN7^IeHAkL$vY`i=v73(^Zl9y9Gs
z79J-h!Q`~kh&blMTr_iMG&r}z@%;oe<9h8!RKj%lY_M%9d%r!nmRpK>v+<UMhMmAJ
zdD!;dJDob{gG4`9a7O%GW~>+1yu|}me7>v%f$-w78SL4iKFWz6^!6PF-6R8jQd=FC
zZ=|kWPgtLVuUwgIKPV2TvCgwZnOv5W9SptRc*F2XBG-T#yjp}WH}|powlFk5&`w)J
zze4UVWz>tjQ)Ohh@4l5%fTlI!MhbbI=8ZE*z%0;ok?cuIXU|8|YS#M#@;y#MT0JK3
z491^IQkH@>D&)^ZBg+@-Oz>hgd7I}Q?X}I~>w@3dsj5D5Z_0PQ)l`6!qrIZLdCT2S
zvo@h3X=%tM>Ru6_(|zN7>$6iwAbWI&)U_zg{qR)jC1NN4=|A1Pw{>>2__=v6q0)>O
zD2=;=Sb|tQ-iXaG+HP?;J|_zPki4!jVjt#!7vU`GcdiS(t*+B_*3Cpq>eceeypfks
z0s<NPt4crN0n11`H)K;Rk&p-;*&>b!4Aj*`Eu5g-U`r=+2)7s184&^!lDL$YGuXl&
z;>KVOv9@)TVA^l#U}CVflwi^qPzR|y%Ry{xm3?3k9iPX#7C!bCB9=^2k~rdCq6h*g
z#0|{g1$A(A74?!}`o$}X`2EuiWMcRQakH0TGEmoKkaL1T82GvQxj_I0FIx{@CP^Fy
zahRo*sJ6V~pA?9e1e1-Mo3kho=;`Un?a9aO1hWS6h=_;)LA*d-UH}3CaP@X{1A74+
zU73GU{J|j)akYRUbhCAGWcbMmHg|G&lVD;(Txa-`{HLl4UI^o#9sF$nqIY$(1gan!
z{D|=&06<<4NEiU(1@MXhfA>dRRagJZ+tKw;6%l#@y}-^u9&Qj23jGHUS2qQZzx(^A
z9<I8G(;A>Q#MQ|iW&u&~fH=A_|K6#ygS+eReY(3sewu#8?O<sIL<IG#=ihylRMa*9
z^7$#FwJp^7m&Z@^??_9Fzi`g(Fo$0lOA8>x0Rlw?;)-DA`3F40|1XDsI-FnRzl0K%
zcd~H*$)X}J!Spi#QA;NaTT9VjKl#DtLgs>2d;mUk9teQnT*Mq;ZY9JE06~N;`GtkS
zmco`+zfq|;y1IcKEg(Os5aisp2p&OxgaaSM3c$w)0R#Aj`78kD=7J!Ag|M&yL`WDc
z#0L`ojY0!vi%4y-!|zf3q_RX%@mpGgKww@7K+r-&7{G7I4+aQBKs*2|5dlGA5k5Xk
zJ`ng9)lXqXWi(YJn0UECe_J#iz;0GfFsKBRnysU|*WVX(ZJ`hyH}Fr<cmzN~!ooa)
zAYNg9UXXy$-yl5*%oUNfKRHFX|FBzHh$<rZz=+(jg@UaiKxaqmUk-?fMde@+u$vQ1
z*U8C2g6U^O3<yUcFE<b9S2Zw*|C#5aYEBm5pY`y|0b=>HRQ@a$S+F(mS5qALufYEY
zla7s(r{n({&)?9$SY%*so=z}(4VZ?x9mK-zU-SGk@Lx>Yh-u2z4d$)#-wf)1!-@Zq
zn92xWCz$td{p&zn{%HL%mpIt|l8S-hSN)2DEq<yf!Q=||fLQ*z4G10oxMX1icC>~d
zCdxmn<iG5;|0H1%DP?62;sFD|=7NZX1zA`EMEFGb0RmtP5nhl8#L^t{N0$A??&@Ua
z<_U&DWULWogt*s;BKqrIGjROMHO_yG$I}La2$T!ND+&TJ{c(#K#DPEO!~Yth_|F+b
zU0w8d5yXGaD55GqGfl_c+1bGs0{cgC{wrDjFSy_Q|4h#R&i!}TAKr3K&fbU;wQ<w%
zbo`gy{}bRJ3~II(5Jy+1e---gkUwPkZP`G?{D%#(93fUW;9twzpQ-V)dj1Drf2Q33
zU=IlD|8(+i>H8nK{v+4FrNF-h{!e!ON3MTMfqx79pX~boCKt}%56BQl#GgG+#N#hL
zVlN2s=!|A9qb`Gl^e*n+H5eVy#xPe^l1IAx`Oa-Ceuc1LJ1ZNyA|a7~`}sj$kCh`t
z7%|;c)D<vSaPY8@P*m<EIw2w53sjMp(X~MzzJE_s7k=8li1`vrK025-OyNZ=OONvS
zjD|oxn@70|&IJXTlm!h@9tIaZMAJq(&*lE}@k5e|oQ6q*ck@LS#A~^4U9JmkbRRGT
zSY1TYGt{)~pJu*1U;n;%p1epF<GIo1I(nD=qvKqHS*x&o=)__lm;P)rajj4({^2qg
zGjjozH2Y9(o!#^U8TqdRuh_G!hSNW8y(uq`W?^R^Tt%2v?d<JU)YNd(cp*4slp-(|
znREkveSMVIE6QQw5Tl3WtQuG6`#{x1md1vLiOt)aAG{MbL7L+H{JKSUqfe)&r*Y!S
zhi*ft9{I}wKFGeCltso>_`p=wE!`VSE2eB+@SPqd)Vx^0q8GQu9?tzbFK-OjSEeKh
zB#%oznZ{?$QC?oo^6uR`ma`*Xpb>*4E;A#6(-VEqOGfgs!J#3JL`Y3&`j{6OEn1CF
zHH901g7U<m%|}2*L&Mrn-N3+rBeK?d6hEY)`nYR8+*Umm6tvLn8j&gPotU^Wl*Vjf
z5io#8X&J<~U{y<GqdI>T%|<8gRXw`g8S?#`$L{RAXpOv_9Qy6)GK%e)3hHK`(+7o|
zor?1Evz%oDB*eu1ZNBII3Cv2$)*%aChdv6q`Tc0ad3iY@VTZWZAVB^{u~X%Wuoe6l
z{ee~kVOD8&q+jQy_minq^(rgOaB$~2WmBdAl>=tRExa8Z(=y{}#3X`PHLM+G^+Kx{
zelnOJR^)JSaIj?C`s`k{=~)Ie(YZV0?xG35qQ~slWv8KdSn;gmDPc7QsH*|`xgRk!
zs?rZ{-muiTtSO>D|9q$QdUk5+4I!v|ExM#AMT)iM<AzmcLV&XPh_Ibc{J{Oa1oJk9
z`EQz2Q6%iV>>h;M<-up!qDhKr!mfvW_cP`QyH2F7Mc5)9xp{;gt)We{IelrLBD{N~
zuKt7#o+0Eku~g(HvbEqo#$9#%$j(FpI*}bRRQm0kV?cX5h(e@Dnpq@QPZs-QL4g-F
zy5c8%O3o-BKY_*14Bv-`fohtQ7p+BdlpKvR)fB*8e0;g)!-C-Hpw`$dxux;0uzMxf
z;ds<u5-Bdg5Z#oNXR}$H9QYK#r{&Rr%n5Pz6yP&9M9WPR7`<eEkbWs&v<SVuzO3=-
zC#9g!3ESOuz&SoTqQN}~C1O^LuQY8T&ODrMNHu}k2Fv$b$z)3U`)~s_pFB}mZ*AK)
zQKaOS+aFhz3&+iSST<cM7Q`}|ZWL<qyfm9gQGb*_x>rt*vJFe?*8LTfPPCQa5^E{&
z{-(Y3u!Z*qp|y*|<&|EEwu7Txx;oklhR#&555`o@2o3L2?uTMNTVNR8(o;>3w?++{
zTGTUx`ntODy}gR&f*IS7I&3G|YTS496vSs$xo<~HTwOj@dolCE0B%tVFG4e@W_c5`
zC43VT6NzgegXCi034z{&E2?lw>HO7r6=`f^#{G{6n}{R16{zV=8Y5=J5c1FlHNz@P
zcnhj;<k8IJU5kW<suG+LNJC^5FvvDoE4?D&gu0D67-p6<;6B?=hkuml8Q^+@IIvf`
z=Q+1>RDQyl_^{^@ZxlG(ELhT-^v&wRb$$nLI^Wim;aSZIkzR%~R_XMYG@`FTc~;|Q
zw69X`iisr*)vXN;(}JAiOORQgNhnB&?(VejuT0V;Ce~JdkA6d}t7oq`_-V+Co<;y^
zuYtJ^`N?<J#zI%<UJdKJA+`{Y5nevNV%ZED%c0GnVL_L>9Q}uO#?m=d+NDGdcv_&t
z6dp`xz1+Tm2m<=V#THM#n$MuwDPHHpPZ}fnOs3}`i&~Wz%sr^6sN0?0aCnMiPQr%D
zd$@U5Ej`|gb~A-LYC^VxcLxW~T{FO*MRnh^T^G$mii$5^$t!*c#NgsjPZ2#@@i`U8
zCfM?`tBy}lCNbNord+<yX2zSQEG>;hC16KNCF;iEeXxui)Qw`XBP&j8vC0l98dIoy
zNRr3mK~40K%0!-U0cCkchExG|zGqrA$vyP~H|c)G5sur8;UJ1J7EwNOxcxw>trzah
zBk5D((^R`PA6_HHQzkjXXf;)(s8EF>&NnhswGsK>MdcW+G2*Kpk61nfSks!u05tJD
zQd|rG-|$z<?WUeYdIJpWrU#@QW~p7Ji{kaoN1Wp|G6Z9+cUIMsY2(w(B2_*WxH9ju
zf_WM=5WA_C3r#L(^6ay7wQlCcT<9<GXoSZe-@kzBrx0FAE=TLT^6;KD@ja`tvm}Ii
z2z=@zoahIUP*H6Y(oUGF?~V}d(_f-_T1>^&WOtfSq9)W$qXWOAj8tAs5#`MjKK~5-
zT)Co~z*yj!DniwOz61I~q(Z9vNCA>$u2G_BMbogl#@IDVwZ|EKmSjcKq-W8X<Ln&X
z>zgqwllTxW&HTRY4l^V<C_sC*{pfy#yUHZhON@L!f_!nLrtVy8UflcW=H4x}{3T7T
zMc<c4C?9N1QN0Rr;h2I?vjsbgM@MqVFtmXQ3~UMe$w(M~zzVW=qot;hFugYiSgl9Y
z2@~7InQ0ohNpk0(%UK@X3rxRP!zWh#%8@A2?>@>!SD%eU^+Ts&0qdj6192Q~F0KM8
zv;=f!R=Uil#W)krSw5<lHu3lu_bbp1z3oSu^OO`!@wvJ9NCdZ!JZzF=_C&Wiyqox1
zNtaLEIuny}GMztKwRCpoK_6rmN}^j-HJcwm`XhrE7KW!<PtLh!MB1#U@bF`G_Pfn`
zz4wx^UsMSLDT~<(1i+W{QcI)9gq~RV_yx#gH~7d-P01(|z0p*12S$m7;o%tCy1G4M
zDfs@l6KQ)zMdSBe1;sVR8t*x(7#Tfp8tmS8@aXdvkHbJm=k!6v!2M8Fh;zF&&fK*J
zB{Ro_91uoC?4J=YOw?icHb!3_6vUkH@qXg!EG#OLR>gjXIt)JRK0c@hchA?}$zEKn
zUv;6UR8})krhQO3StO%>{=%is-%Zu1nqk5G-7U3;+S4ZcRr=QUn|H*xL{~Rtqp{y5
zG>li|{O(=qgN@8tl2aTxjREADcsHjgh*Myk&WJ+Jg8}-{+lSL|_*xtqu0J;=J-w3<
zTDAElw3H9i`P*rm1)n2E8j-oV`KqNR-FLO1O)#{SWOa{Jx?*tC`|}<~#Mym-rPsHG
zP<e4ov4!<Rd~cJo3=duBR-gvgp6>v8MCZo?jL+Sd^9q--II)f2RR+P{bOy?#7{x=W
z%5JQO=m&Kkrl;#FA5V9t=8eyj2h%Jhg<rdGvJKIGo`q%4wwp6HR<AoZ(yk0Kj!xo?
zyqaJCZnu(shVxwOLErKLi>S(AHC+tB$Rvu*+&;%=45k|$ai5c|r?dWkNU=-fup))E
zdx5-F+JopXC(=x%Iu0n_M;ccodspjbMex4&5AOZo{KfnF!evO((>%v7jj@$lO+^LF
zG1uzNH`ngp5`0WWe<4V|VxPqoFvT>!+<tR*60^0n^(A;&|3G*b;Eieo=o@V1Xl-LW
zDC3?{344}oDtqTKD6OkYTIpSAhO`Gh(aDkYS5{VzWD4X<=eiT*z<JDj@lwaxxthu4
z_S#$9$f$Jr;uZ7V9X;=g?C24n)V60%*83}Tk|IDK;f2!rF7?e-*a!WMD#j0ulvxq$
z>+5Ja6bY-VtGh#z0oSRS!YkK$D+0`yj+%k|u(gtm^QliBfMTl;JnZ-=3#fG-`zKRA
zKt88@&#0r!j+7^RGe>3AG$i<Z5!}JX+}B>q-8NE!q0h-4I%BD}Jb6;Fz-6CQvbdb8
zojNCuWpu<ROwc-D1Ejv9?)Q{vTYu9Hcj79BT0@*ggzFOyK*ud0?v(DMm81E$GoI`O
z$h1GA8chzSPd|T>Uny-@>OAaa?vniyN*>ms(Qo6G&-i5z*7Z5C((0He{-tw)ds9SX
l>s<%j?(s42-s&CZFl&S}<#E~^;_o?<io#?0N?Ehu{{<c80*?Ry

literal 0
HcmV?d00001

diff --git a/cinelerra-5.1/picon/cinfinity2/crop.png b/cinelerra-5.1/picon/cinfinity2/crop.png
new file mode 100644
index 0000000000000000000000000000000000000000..d30220f53657244bbeebb584faa7f2e9dc6b3076
GIT binary patch
literal 10118
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
N($zH7C{nWx{y($LB6a`(

literal 0
HcmV?d00001

diff --git a/cinelerra-5.1/thirdparty/src/dav1d-0.4.0.patch1 b/cinelerra-5.1/thirdparty/src/dav1d-0.4.0.patch1
index 05396f33..94c9d7b1 100644
--- a/cinelerra-5.1/thirdparty/src/dav1d-0.4.0.patch1
+++ b/cinelerra-5.1/thirdparty/src/dav1d-0.4.0.patch1
@@ -1,7 +1,23 @@
 diff -uN dav1d-0.4.0.orig/Makefile dav1d-0.4.0/Makefile
 --- dav1d-0.4.0.orig/Makefile	1969-12-31 17:00:00.000000000 -0700
-+++ dav1d-0.4.0/Makefile	2019-08-30 10:30:39.846512952 -0600
-@@ -0,0 +1,342 @@
++++ dav1d-0.4.0/Makefile	2019-09-05 16:38:01.820636946 -0600
+@@ -0,0 +1,358 @@
++
++_ARCH := $(shell uname -m)
++ARCH_I32 := $(shell expr "x$(_ARCH)" : 'xi[346]86.*')
++ARCH_X64 := $(shell expr "x$(_ARCH)" : 'x..._64*')
++
++ifneq ($(ARCH_I32),0)
++ASM_ARCH := elf32
++ARCH_X86_32 := 1
++ARCH_X86_64 := 0
++endif
++ifneq ($(ARCH_X64),0)
++ASM_ARCH := elf64
++ARCH_X86_32 := 0
++ARCH_X86_64 := 1
++endif
++
 +BUILD=build
 +DESTDIR=/
 +PREFIX=usr/local
@@ -96,7 +112,7 @@ diff -uN dav1d-0.4.0.orig/Makefile dav1d-0.4.0/Makefile
 +	mc_ssse3.obj \
 +	msac.obj)
 +$(NASM_BLD)/%.obj: src/x86/%.asm
-+	$(NASM) -f elf64 \
++	$(NASM) -f $(ASM_ARCH) \
 +		-I src/ -I $(BUILD)/ -MQ $@ -MF $@.ndep \
 +		$< -o $@
 +
@@ -174,8 +190,8 @@ diff -uN dav1d-0.4.0.orig/Makefile dav1d-0.4.0/Makefile
 +	echo >> $@ "#define ARCH_ARM 0"
 +	echo >> $@ "#define ARCH_PPC64LE 0"
 +	echo >> $@ "#define ARCH_X86 1"
-+	echo >> $@ "#define ARCH_X86_32 0"
-+	echo >> $@ "#define ARCH_X86_64 1"
++	echo >> $@ "#define ARCH_X86_32 $(ARCH_X86_32)"
++	echo >> $@ "#define ARCH_X86_64 $(ARCH_X86_64)"
 +	echo >> $@ "#define CONFIG_16BPC 1"
 +	echo >> $@ "#define CONFIG_8BPC 1"
 +	echo >> $@ "#define CONFIG_LOG 1"
@@ -186,8 +202,8 @@ diff -uN dav1d-0.4.0.orig/Makefile dav1d-0.4.0/Makefile
 +	echo >> $@ "#define STACK_ALIGNMENT 32"
 +
 +$(BUILD)/config.asm:
-+	echo  > $@ "%define ARCH_X86_32 0"
-+	echo >> $@ "%define ARCH_X86_64 1"
++	echo  > $@ "%define ARCH_X86_32 $(ARCH_X86_32)"
++	echo >> $@ "%define ARCH_X86_64 $(ARCH_X86_64)"
 +	echo >> $@ "%define PIC 1"
 +	echo >> $@ "%define STACK_ALIGNMENT 32"
 +
@@ -297,7 +313,7 @@ diff -uN dav1d-0.4.0.orig/Makefile dav1d-0.4.0/Makefile
 +$(CHKASM_BIT16)/%.o: $(TESTS_CHKASM)/%.c
 +	$(CC_CC) $(BLD_INCL) -DBITDEPTH=16 -o $@ -c $<
 +$(TESTS_CHKASM_BLD)/x86/%.obj: $(TESTS_CHKASM)/x86/%.asm
-+	@$(NASM) -f elf64 \
++	@$(NASM) -f $(ASM_ARCH) \
 +		-I src/ -I $(BUILD)/ -MQ $@ -MF $@.ndep \
 +		$< -o $@
 +
-- 
2.26.2