From 37dccacf7c50fb320a077b1da9b287545c52978d Mon Sep 17 00:00:00 2001 From: Scott Kidder Date: Sat, 12 Oct 2024 10:19:11 -0700 Subject: [PATCH] fix: Resolve compiler warnings on OS X and consolidate CGo settings. (#194) --- avcodec.cpp | 5 ++++- avcodec.go | 9 --------- cgo.go | 17 +++++++++++++++++ deps/build-deps-osx.sh | 10 +++++++++- deps/osx/lib/libavcodec.a | Bin 19491408 -> 19491408 bytes deps/osx/lib/libavdevice.a | Bin 147568 -> 147568 bytes deps/osx/lib/libavfilter.a | Bin 775408 -> 775408 bytes deps/osx/lib/libavformat.a | Bin 3926096 -> 3926096 bytes deps/osx/lib/libavutil.a | Bin 2658040 -> 2658040 bytes deps/osx/lib/libbz2.a | Bin 219784 -> 219784 bytes deps/osx/lib/libgif.a | Bin 37784 -> 37784 bytes deps/osx/lib/libjpeg.a | Bin 474432 -> 474432 bytes deps/osx/lib/libopencv_core.a | Bin 3063832 -> 3063832 bytes deps/osx/lib/libopencv_imgcodecs.a | Bin 391216 -> 391216 bytes deps/osx/lib/libopencv_imgproc.a | Bin 3351304 -> 3351304 bytes deps/osx/lib/libpng.a | Bin 401704 -> 401704 bytes deps/osx/lib/libpng16.a | Bin 401704 -> 401704 bytes deps/osx/lib/libsharpyuv.a | Bin 35496 -> 35496 bytes deps/osx/lib/libswresample.a | Bin 416648 -> 416648 bytes deps/osx/lib/libswscale.a | Bin 3156096 -> 3156096 bytes deps/osx/lib/libturbojpeg.a | Bin 613616 -> 613616 bytes deps/osx/lib/libwebp.a | Bin 786568 -> 786568 bytes deps/osx/lib/libwebpdemux.a | Bin 27240 -> 27240 bytes deps/osx/lib/libwebpmux.a | Bin 68832 -> 68832 bytes deps/osx/lib/libz.a | Bin 153024 -> 153024 bytes giflib.go | 9 --------- opencv.go | 9 --------- thumbhash.go | 9 --------- webp.go | 9 --------- 29 files changed, 30 insertions(+), 47 deletions(-) create mode 100644 cgo.go diff --git a/avcodec.cpp b/avcodec.cpp index 75e60300..259f5e7a 100644 --- a/avcodec.cpp +++ b/avcodec.cpp @@ -413,7 +413,7 @@ static int avcodec_decoder_copy_frame(const avcodec_decoder d, opencv_mat mat, A NULL, NULL, NULL); // Configure colorspace - int colorspace = SWS_CS_ITU709; + int colorspace; switch (frame->colorspace) { case AVCOL_SPC_BT2020_NCL: case AVCOL_SPC_BT2020_CL: @@ -428,6 +428,9 @@ static int avcodec_decoder_copy_frame(const avcodec_decoder d, opencv_mat mat, A case AVCOL_SPC_SMPTE240M: colorspace = SWS_CS_SMPTE240M; break; + default: + colorspace = SWS_CS_ITU709; + break; } const int* inv_table = sws_getCoefficients(colorspace); diff --git a/avcodec.go b/avcodec.go index f5bc9e9e..7070059f 100644 --- a/avcodec.go +++ b/avcodec.go @@ -1,14 +1,5 @@ package lilliput -// #cgo CFLAGS: -msse -msse2 -msse3 -msse4.1 -msse4.2 -mavx -// #cgo darwin CFLAGS: -I${SRCDIR}/deps/osx/include -// #cgo linux CFLAGS: -I${SRCDIR}/deps/linux/include -// #cgo CXXFLAGS: -std=c++11 -// #cgo darwin CXXFLAGS: -I${SRCDIR}/deps/osx/include -// #cgo linux CXXFLAGS: -I${SRCDIR}/deps/linux/include -// #cgo LDFLAGS: -lswscale -lavformat -lavcodec -lavfilter -lavutil -lbz2 -lz -// #cgo darwin LDFLAGS: -L${SRCDIR}/deps/osx/lib -// #cgo linux LDFLAGS: -L${SRCDIR}/deps/linux/lib // #include "avcodec.hpp" import "C" diff --git a/cgo.go b/cgo.go new file mode 100644 index 00000000..070102b8 --- /dev/null +++ b/cgo.go @@ -0,0 +1,17 @@ +package lilliput + +/* +#cgo darwin CFLAGS: -I${SRCDIR}/deps/osx/include +#cgo linux CFLAGS: -msse -msse2 -msse3 -msse4.1 -msse4.2 -mavx -I${SRCDIR}/deps/linux/include +#cgo CXXFLAGS: -std=c++11 +#cgo darwin CXXFLAGS: -I${SRCDIR}/deps/osx/include +#cgo linux CXXFLAGS: -I${SRCDIR}/deps/linux/include +#cgo darwin LDFLAGS: -L${SRCDIR}/deps/osx/lib -lavcodec -lavfilter -lavformat -lavutil -lbz2 -lgif -ljpeg -lopencv_core -lopencv_imgcodecs -lopencv_imgproc -lpng -lsharpyuv -lswscale -lwebp -lwebpmux -lz -framework CoreFoundation -framework CoreMedia -framework CoreVideo -framework VideoToolbox +#cgo linux LDFLAGS: -L${SRCDIR}/deps/linux/lib -L${SRCDIR}/deps/linux/share/OpenCV/3rdparty/lib -lswscale -lavformat -lavcodec -lavfilter -lavutil -lbz2 -lz -lopencv_core -lopencv_imgcodecs -lopencv_imgproc -ljpeg -lpng -lwebp -lz -lgif -lopencv_core -lopencv_imgcodecs -lopencv_imgproc -ljpeg -lpng -lwebp -lsharpyuv -lz -lopencv_core -lopencv_imgcodecs -lopencv_imgproc -ljpeg -lpng -lwebp -lz -lopencv_core -lopencv_imgproc -lwebp -lwebpmux -lippicv +void dummy() {} +*/ +import "C" + +func init() { + C.dummy() +} diff --git a/deps/build-deps-osx.sh b/deps/build-deps-osx.sh index 1fcfac90..7443ef9d 100755 --- a/deps/build-deps-osx.sh +++ b/deps/build-deps-osx.sh @@ -60,7 +60,15 @@ tar -xzf $SRCDIR/libjpeg-turbo-2.1.4.tar.gz -C $BASEDIR/libjpeg-turbo --strip-co cd $BASEDIR/libjpeg-turbo mkdir -p $BUILDDIR/libjpeg-turbo cd $BUILDDIR/libjpeg-turbo -cmake $BASEDIR/libjpeg-turbo -DENABLE_STATIC=1 -DENABLE_SHARED=0 -DWITH_JPEG8=1 -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_OSX_ARCHITECTURES=arm64 +cmake $BASEDIR/libjpeg-turbo \ + -DENABLE_STATIC=1 \ + -DENABLE_SHARED=0 \ + -DWITH_JPEG8=1 \ + -DCMAKE_INSTALL_PREFIX=$PREFIX \ + -DCMAKE_OSX_ARCHITECTURES=arm64 \ + -DCMAKE_OSX_DEPLOYMENT_TARGET=14.0 \ + -DCMAKE_C_FLAGS="-mmacosx-version-min=14.0" \ + -DCMAKE_CXX_FLAGS="-mmacosx-version-min=14.0" make make install diff --git a/deps/osx/lib/libavcodec.a b/deps/osx/lib/libavcodec.a index 87e8d6f015bc224b430ca66c25b0ec788d0502e6..887c4d4ed9a2c1237d7205727590799f4b388a60 100644 GIT binary patch delta 4659 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 E01l27@Bjb+ delta 67 zcmey+!1Btz;Ho<7ZG-&Tkyats8wWAIA(ZLyJ!XqLJo;w-PEgR@0k~WIKTh%@bdCaL7V!bm_j23EsPXuw0m+FWLOGKt?6)Tar7{?R(D^g%xGlWr~}(ZeS7UeH@EJj z;YOie^GaEv(9C=T%*;35&B$FW=%RrRA9?p)*}+$%nxIS>9yL}wSauj*mSnpG4}&C& z5hRN#Yg2Y86!DuN;y3?(TkT-#uleUy+5KrR4Y$Kb?`+oWKc72pqrl{E9=;@xORfM7 z(P;BzRCcW7XOLNQ499}g0%i?m56ZJ#(nmvRnA%C{_K)IRh}Y3L49;dN(aA9*0W2Fg)_AXu{;L~1diy)u$F-C&DMc-=WrSX+QJ&+CgS09sUqU0YB qAN&>EgD8uCi;KPAb`-aO-W?chI^)r-KrsdKmA&KD1NpXYhL&x_-d$^Eh< zulo(8)ns)%(|HZ$hcBkd-yN)W`H{i9e}qBBl<5~Fg+eE=Z_8#r6#-=;1Y{z|!gp~R zRFWS)^+{$RtGkRV^8f|nG0iOLxX4rH5^AlsC&6@p=f-n5K)Sp*cAl0#ss zD*6Ja1XrDUgVPM9fDENvs>11Xi}Fhjr$LPhf|{CC6E^zoHPCObm962rFJGG+o66tASS| zuM@mZf=8k==Sp1~=Ktze(*=GoW}sl~Yg6Z32~l$76eLHQpI#O&deZ!QbiEm(>v}^L z*BD4GwuFCSwtA0hqMeo_ztKtQvpy3u{7!(F4 zw|Pc;(l*$W8rz6MXM(Gy!6Y|+d?%dTNJuE4HjEq`;d|k8+?qIv4qWHqz|}rTiXPl? zx2yjZxG*{2*P-4KC(xF~1X~t!>}t`=*U}IfH_PSX$@2;G@P-f%X;cjK1}vV&BlXwF zGJ9RDhjuNqKZL(L(xio+_noeB5#yZo;kDv1r>0?G**d%{#@T5bsS;7TU|X5PNTZay v3sP?T(qn9CA)d3lI1yDB9p8V7C^fMz1x5;PceCHRF=~;2lm-9jg{=QS_5V6t diff --git a/deps/osx/lib/libavutil.a b/deps/osx/lib/libavutil.a index 7e2e1138ef6d67951a809832d2d52e868f0699e0..e08927d85a68ab52daa01fd69e05d374b3e8bcfb 100644 GIT binary patch delta 1380 zcmYk6TSydP6vx?%yE?8mvs(Mj?0Q)*?V1*ro2x0YsfbaOrVo~3X%hAjl=zpjpseGl48v82$bkJO zw$rDp*N~kdWoHZ}@8tpl-zUP_Vgu~C^zK zyxe0~02jV+@%!lJ;!0Mh@kEDTHbLJLV_Tdk-(ZR0&iQ1-h=80=kqs68G=W!pHy(ZK zN8VkOvzA1aF4}y~B{LpZx%ssqGN8YG z7k#o1%?|ptJ($HUUz+D=72p)ZM(V-^w9;&G)|oa-TLSIP&PEYn2P{=}3ieo|nnp!- zqmB`c5d-XOY>9M~m=@fv8Y@N|Mm)4?5^AJ>j=^3VakGgD7>O90flajCX`q{+)@`Sg r@F_s$Q`-*d?$^s;@SAPbC|T8Z?M~TBz~{7U{S(x70e+U+b?N^Bw1%(a delta 1362 zcmYk6Ye-XJ7{}S1n;w_G$4h(PZJN{BW?E>Omz0<`LM_VM2Q9H$5=IDOe(+LZW{g5? znq_2>`OW-dHy$&CB7#Z?D@f5IOS?#6HX^qkdzO*hB+y3tj_19{P~GjJEgpDG(T3#z4JG+ zgyH9FiZBc%s7|K)<5RnGN?~iI>cxytvgfL;4Geon2^@Z;-eh68Fi+s#NA;4^XCAZp zSr7RTwfi}1WxQLXnY}DfcW;6ULrsrHQzRI&C^O`s!HyOf~dewQ|A zy@Fq!)85ZjaQ}q1X_Lq+I~;nQxmck$?9&}o>WiJaL`fI?pLNS&azBBxKf0z!MgLDj zKxU%AkmL+-W;4m-(i)-jbbwbpl`@9jn*p=qvQGI-V2Vd(BX|jC+`vYmTrMj~lqR$$ zI8x7*iC5B51U?LKdu?(nz3MeL6)!V}g1=n&cgEA5Iszx>f{J&`^XRH{{n-?Op}AT= zlFU-aHGNjPSRL1wd}0j+^&EzUkyWkHK6ZQFtpd-x;1RW=Ry7?ARns9|ysrk>8&cV# z;7fH#!zp;^1bWNfbhof)um_c|5p+QJ(d=<%ZLUM4d#(frfjNV(3iKDAeuo9a^&Gx9 z&4+v=|2oNsssaA7!-pTf@v%FEffv0Y1T1Nx2iqmp0KHE_TVo`|?(DCjG{PYJYk1QE zsce9WyomDm!i)Y=!VHj*OI{RcMz(<*mI%KBL ztitrxC@@fe+ZL9hJEoKv*+s8>W13=J;4ql=5zJMPXx50kgVKf# BwAlav diff --git a/deps/osx/lib/libbz2.a b/deps/osx/lib/libbz2.a index 7f7d7fb8ee0416de7381f3ed2cecb6c3e71f9dd2..2eeee3a01cfa4589d9f842641bef3f821d066f82 100644 GIT binary patch delta 105 zcmeC!%GOUw|a;pSh=i{`=DixyR>!`Mov9&y9iT-Q$V!`Qc; WF1iF|Z*SVcShNzx`IX4j_X7YQcO)wS delta 105 zcmeC!%GL?R6zKnP*YQIsA^)7_-qUg7gfH{v{}QGi^D|MT}5 zS1**ZZ3F0Ao>BM#)h$s%!x+@EmQnN#7qS;o((kqU!a_B?-R>N+-t$`RzK5E4hB=O6 zB{PD~%3h&^Trggv`?I~mv1uWURN|{X#l;xfY%CJG=is_(CCu-)$N2L@d_y?ZJHT;guXgD_Ia#gbZ#sx)=uJh(ybgVL=}mDh=O+vl=d#bg*UO3E!x)kK)*{h5X`a#@Z z>i|TZjIO)XJ{&^|)5pQ6k`GXj{dfgVa+}ESkaiwnHepHFodXk8WTt!+)v(wY{K3O3 q??8*+@!0wV_)E;9&%i8qp#6{wV}ttA&MVG7F7kaRUdUqKzTp2!BF@kN delta 1542 zcmZ9MT}YH!7{__f$1`QqPzyPetCm_)7GfVxQ%hpD4QVm3dodSYNDxe9Aw(t7#b8>p zxHhE2&Xg{17hCUcM3N28iDFG7iX>jlzKF6=V)~-##=NkS=A84M*|)u%-~W03|MNWW zIWshqKQxnnDxXxYsoW6XwUg%cZyG6}{MVZJ@JsAT6cs+yG)H23i8sf>6V=3%s4ZL1 zad=gl{8#Nx{8n*-W7k^!2YdD1pM{C;hgJ6Kp#!4Yf6%)GM5H&-+Px!V&}K%N8Px`J zEX=xfjdS+mtk!@PtocjA$T*eimSqraKl^v7XPbdR#ztXNR zL=_uZ+q5=Jm0I^j`oz9!gUEsd^+2)JlH*48UE4h%YqQ-o?aAYTa#DzeBCV#YB6*baj z{FeLo)1=QXEIv;~hHlW1dc*yCCcNmP)p3c2OY9vJqm(~-mODoK@OQ!^OL+1>t256i zfB39voVt`1pJU)Oh%rnJyi281^jNo>EiINjSOTsEHr}!h#B{+*sB&7#UApFp@0}t} z_U{%L|7z@E!=2E{g+K(#)r8s< z@~|^qQYei=3hW&#dqC`@p%((Gqbro@xT{NH_AKbd>c}DFW>;^*NuJ@q1u^xPdVd5j zW-})I&V}|-FjPjy${nv5L@pM50(ZDt_!O#KcE2O9Y@Fxwg9NOwOMRZ3Wd-YW3rf~f-ROL>#$=o=c2*lBOi`ou*#AYth^$}Sqz4= zJSFw#N$Ag4PdiH>5PQ`fjmqtPa(vUqfJoP@U8+=KcR&h`)Ie~=^!N-0@HK0C@Lo;# z$d*J41$Rfy*Ups!^E-1=hXLvg4U0K*Yvce>5@EFfVXa+1Ura--n!jB8 z0mBZSi({aS3(P*^XABsiNnqechTpRs0Q4qVzB8beH<5EOuwCG}d)S~3f<4h9*%QZ+ zP9WLAo^bruzJ*sln@6MLPdmuhI70=oE@y{X1+D74OAApa(n(l|o*I8yvH;-2qD0CUFcmnOB=##Ty;k41?jkw)GZ)?!g4*OwY@>Z!o{Ye-!6?a6V0rZB@Szijq X{tA&r4JbX_dh41t9)#(fYeM%AF|R;$ delta 1008 zcmYk5T}TvB6vx^1V{h%~uI}2*rrE4B)vh(-SgSK)WFT20w7H5xfh+kC2(b$y*&4a9 zF&j#(Aj}Fqv{>Ln-(sh=66q-Crcq zG*+sjARq=LNzH^@bX>Y4S>`0`cvm5Y4U!B?UDlhWnxjF23)ie6q<_mwCSt|P!^($D zq+mcbxEf6$TJfPm@F81!4}n@~B^9}J#II^gx8~VtRk#^(6PFICum@} zRAvACg5*SVZW@}u*vCnZs)KcwqRNQl>lk@YfOm#v;O>xf;2Z(* zWr0zrfU`rzJLjk+Un{0Y5{QA<3(ixW#H9}hxk>=JO4rU4xH`|#udbBd|Fah}kPW%U zE*fCMODo}N7lfzX-z~(W&m#QDO*Ipscbd$(m1M3A>i{Hk^xI*rL8(?&+Iksi>-8*w z?iSU)ZGlll`XE+0Rt44}tV*oIAkyrwl+nP0kc$CnhNS`|F%BF9eP7uz2LamV6|~7> zc>!%!ef(f7;7!BU95-%kSj3@ll^~d@=uT<7F5IkkWqY z8OgwxpN4R2b(3?q1U^(H+g*)y9J1XfVo!FR_~t{fKb1(>$I}dRgdqm}2Ie&{9t7;n%^y@U{@j8bF)z`pcS0 PJMnMu9++CFxo!Cm7qUoO diff --git a/deps/osx/lib/libopencv_imgcodecs.a b/deps/osx/lib/libopencv_imgcodecs.a index 3bd0bb75feed05e98a8988a7e7edf31e5f22cc7f..b641a4178b9bca9d95c7eaa7d91c6d18490a31d3 100644 GIT binary patch delta 316 zcmdn+L43mp@d+}lW|l@~7SjvsnZ-9+{8`8b;+h+6wpzsG1eP+Ns3^WU;>nq8IB&Z{ z0Hcl^g4>bDxW=Caq;L9zZA=o|1NJetFe33k>__EKI0)w#)H6$LH#p3g;|oy_=I;<- zs#yZz9|&ZT+#a}q_UUd+OBXyXu$(IFW%VdWq65DqOFx4zUa09k7 z^*{|V+5Tu7lUD)6M3e1C>daOVV7Ho2R21LdQO_I`2j_0P$1LIj=WRDoW9iWb8#?{L zHYSPb0s9z*w!aEwDPlwjZm$St*)t!)H&ADm*dFkiWlA%Gzpb2=#T>#t5Xd62U11%o GfENH9zFrsr diff --git a/deps/osx/lib/libopencv_imgproc.a b/deps/osx/lib/libopencv_imgproc.a index a757abb59848af338e34da33f7649ee2165391b6..75369eb086737c306e8ee69c2532aa93f2d3b035 100644 GIT binary patch delta 1014 zcmYk5O-vI(6vtDbBG7i*TG<_}r4?H#RSOK1YB&HU(CP&Y2Tc74sRS_`T0)E_J%D`d z8c6&|%#z4~-aL2!Q~M-x&;z;$4v-iw8c37_Mh=^haH%2A?hLwz|6zagf17##_eT1> zW|D}Wxy_MFjghFlG-&0=qf=4SRJ7<_w0Q4}&au3N1wm|AilJR8si|bJCmBHSc&nu9 zYKc}YFAiD-cwcLt_cFuyG~yu@H-CLe4eK@zLI1XSf0P+at8PI|_Z}lEB{~l2-m*j~ zH7|G^g1DO~gWW{AdqOX0l9x6^yy)F7C#nGNwxzZD|A7FH4lQ_yfsI5N56Yl*UNV9) z)p|G1K-%dSz;xO6(?`K`AD_QzTYJln`wuMw{IYS$ZX+1F!_C}aKnqK>FLPjDw$BdG zTaQg6l7YuD+G+TX4LDkRSW()C1u>g<5IKoX5V?p>LN;GH@syde9tRI?o&3(04w~hL z0S)+tVH*Q_5DFGR!6@f3K$yFZb}$2a2y@eD<+TBbsc;q1DM*FgvurYU>_;M6bpu*G z{X5UhBmo}08BY$5s%;!Es<@iSOXMRuLsSDQKASnZ>IN}^?ALu4ScyLQPnOWkEh8AZAG$KkfHrwhHba&X z2DD8V)!2EW3!ug>HvOQTq`Ddrw1>h4`ew*IwRHMA!nudk(8gf|!4Khz1@@s#wFd$VHkF#NpowusATcaRWHCg;LJaZF%$3gKU!3opb94Xs@5o=) zEi%>%udThMJs4ChIWL+BP6sX1!IICx(!DjEw<<{whon%x6he7xeGP$>$k8ydWv#th z1PB%zY;!CDg_s>dB4YdYS_h)iJIEurvu*pGCSanEp`~R139K@#laTDU$I3|aZL#>%~u1QuLwB(dA&SQWr-J38x%4H_ODImCMgcOb zm)Z=&;bE$?*BJOP;$)VP&eAyGS?hE>M{<+#-zMR zLtbPuzGDQleawz%Y|Q&88fKp`EAPlP^!yUSX(=JpLPGG)7=g4YT80vn^8%AQ^D|4P z_1M@kUj}s0uHYbOX2pkeH-!7H_g z$-ZjL-1>hoeut8(HiD`)t(2G`F9c8x$SRFHdGGi${5vcSNATdeYs0sY0wesSFL5B+UOQUCw| diff --git a/deps/osx/lib/libpng.a b/deps/osx/lib/libpng.a index e8c523330b081310abbcbfb149986e41119f75d2..26e5b8ad1be32790cd478c356156aab23201ac42 100644 GIT binary patch delta 331 zcmZ2+NMgkyi3u`nW|l^#W`-M;tn|Q4Q=`pEdPQep>|4KIX+qiCPpLA_a)WWQau}rq zV4SWR#x7SFN9qux)_xertC1;)4Z<Jg0dD3iJ93XBtF$8stK#?e~LGD{i8 zIdzQX5<85u=p4(h5;(`1)k+e^c@)E%)eGYUy<$DZ0_9BqCCjF?-Q_)N1tUbnWc#5H stVXgh&M#iJO*~KzMC}zRHn`g9v*g({w^z%sRl;=x&6@@10HymF0b&|4KIX+qiCPpLA_a)WWQau}rq zV4SWR#x7SFN9qux)_xertC1;)4Z^Y9zNnqa>Jg0dD3iJ93XBtF$8stK#?e~LGD{i8 zIdzQX5<85u=p4(h5;(`1)k+e^c@)E%)eGYUy<$DZ0_K<)O#dazrnKGVJ!=IcRAl?1 s53EMAFwQStwoN=JYOhGK!PQQmCC{e0y;_E?60RF)-Yhr=DBZ^h08;*9{Qv*} diff --git a/deps/osx/lib/libpng16.a b/deps/osx/lib/libpng16.a index e8c523330b081310abbcbfb149986e41119f75d2..26e5b8ad1be32790cd478c356156aab23201ac42 100644 GIT binary patch delta 331 zcmZ2+NMgkyi3u`nW|l^#W`-M;tn|Q4Q=`pEdPQep>|4KIX+qiCPpLA_a)WWQau}rq zV4SWR#x7SFN9qux)_xertC1;)4Z<Jg0dD3iJ93XBtF$8stK#?e~LGD{i8 zIdzQX5<85u=p4(h5;(`1)k+e^c@)E%)eGYUy<$DZ0_9BqCCjF?-Q_)N1tUbnWc#5H stVXgh&M#iJO*~KzMC}zRHn`g9v*g({w^z%sRl;=x&6@@10HymF0b&|4KIX+qiCPpLA_a)WWQau}rq zV4SWR#x7SFN9qux)_xertC1;)4Z^Y9zNnqa>Jg0dD3iJ93XBtF$8stK#?e~LGD{i8 zIdzQX5<85u=p4(h5;(`1)k+e^c@)E%)eGYUy<$DZ0_K<)O#dazrnKGVJ!=IcRAl?1 s53EMAFwQStwoN=JYOhGK!PQQmCC{e0y;_E?60RF)-Yhr=DBZ^h08;*9{Qv*} diff --git a/deps/osx/lib/libsharpyuv.a b/deps/osx/lib/libsharpyuv.a index 16186546db67bddb013d64365272ce179da05a5b..7c717c71257833284206c3e7491002563f32d00a 100644 GIT binary patch delta 103 zcmZ26m1)IPrU^1^W|l^#mWCUZn3%v!GmFhyOh(Kwb`on8CyafFFA6TMBow6s6K}Hf VGK8=#H($!nf|_Hw*{LW^0suO@8esqc delta 103 zcmZ26m1)IPrU^1^riP~G7DgMDn3%v!Q`5~_Oh(Kwb`on8CxmUb`4C?eRNQQ{l2DWm XOuWg?%MixCl%EAP$857xQJMq*FWnj_ diff --git a/deps/osx/lib/libswresample.a b/deps/osx/lib/libswresample.a index 8fbe46efd6907154d6048bdd878e750a3305c52d..25f0c4e05f2fc9eb7e985ca2e316dce63d53fa19 100644 GIT binary patch delta 224 zcmeC!F4?hNa)JztnWd5WMgSEdgWpDpv$C%U)<3ycfw5oz~+Glw%ZJ*`AEaeK5-POyyX#tE=q{m`Z2UEIg4a@db jYgjK?fSoqk!C7MajHj$q(!t#6AM6;VwtM-q+3^7Y-Gn;) diff --git a/deps/osx/lib/libswscale.a b/deps/osx/lib/libswscale.a index 83d828b1a81ca07ef9ebd12426b40f42b867426a..e0c385210cc4324ca331dc9023001546edcc72a4 100644 GIT binary patch delta 480 zcmZp;c!041h$qOfm{}T`Z&Y}~!wO=UO;i-$tiXGP9l;Y24Piy_8l*zF5WEj6El6?` zw63Hh_E)1eby{auZvJc+h1jKRoOu}M(tUvxPX`&h-A* zfLIWSg@9NXh(&-{6o|!uSR9BYfLIcUrGQu(h-H9S7Kr75SblrfDur2H5KD~Pxl9$e zbD1hh^+E-j1)C84XC&8gTeL;<`MEi$GRUlRaVs#+a0AkJUA0o9{ z?n2ZAIOs{XPc+vCVx8?1&2=}MBlK=h$k(;u1@pH9&02F9VvlKikb~a#AP0TD7XZG9 Br$GP! delta 456 zcmX}oze~eF90hQiHm$~1Ypo`YwYIhXibiQmj4smIMd;RDXgL)3;83~*1R-`2GPznD z41xy*LE>b=p^gDJ2kD>SFbgS|gEY*; z0*D|%24q--EG$6|mMQ7w?aT2c6;sd(RM3j@RZvjHEsoyVs%))L*(&wl#zoci8mq7d z>#zZv)N3gAC);4?Tc)9JQ$tq=dQj4%bG4rEKZD+0sQ0hqe?gSYR&9s2YP-_+FZnW_ AmjD0& diff --git a/deps/osx/lib/libturbojpeg.a b/deps/osx/lib/libturbojpeg.a index d1e49da9073b067fb2fcda0dd0c626360fd16e76..987e4ccda553237ae4ad2cf5adf99414659f1e14 100644 GIT binary patch delta 1718 zcmY+_eP~-%6aaAF{dn(Y-5zyd5~r(OL)xxNU6S^#V_NElvtv+@VgD=}11S@;tzak> zGM&m)aCR+ZbwU|VL(I0gCM=I`5bFo|XDn>E)%sOz#JHiBx=Gk31mC^q-FW@8zn**U zdFP&cvoaf8nGKFVO06y7?(WHJG5^e#J1vC&b-dZ1>kr(}vK8E-xK6{JFn&Uguogr9bZS25k6pH)C&cj*eQ7>3qM) z=3M&3E{EQzPTAEdt+2{v`{HShyRCns4PlAl(ChBEcP?N)4tD7~>}^n7`xSR_w<>sWb=`e->Nez$ z|BWkQ#b0Y9L4H!njbsSsGy?VPAW+Y9WUyU{A3jLBdH(4`B>9lydyax9-X=qa;*H}3 z>OW2@e#NKKkUx5syy%X(*mvbTcri=zoof6NNfb|9g=`NUCzDq+2i-Xi}y)J@eAWrl@xCtU^dFFnG zdJ<)7{+GvZJC{+6NmbXaW-*&xAv@frU&hYa);jd21&J-#5L0YYqckS5eAp0|ApW{x zIvJez#aTXa6tMFhqXN%^gX@j~=HE9;TV>?CmjPR^7}2LBp7b!0(`sPR^%B$VOzfWM zU`;;Jhp-rvtIsgee|%qK>%&Z(m$jcQ z!?}R>on}w-`1r?c9>y8`;92$__u4tu3H=A}p8=oGvI<;N@P%2Z)4aq6)cDZ?c;<69 z-6HCbh%p>4L!Rm{EaCnr2v048TPrLnp8-C$cdJl;=`QOvl|1c+M|@X}d6MfCp9^?I Y{R2Ty{aQGA@*SR6_$v^5!ZWt%UkiZwV*mgE delta 1641 zcmY+^UuauZ90zdj`E&0{=Yke&&+o@2B)iARyYZID7JBW1~c@ZOHTUVzP7bV)MrEcT0RS4dDe)ojyV?X_! z@A;i`em5&Kft8uSC+kUPsB`N`(C?e-deBPkKSHCS1?qt_93`ahqS_?GXOczL`=4H@zaUatw=Ow!DL@8zeS-3YF$( zxE7VT`U7Md*RY{V3@-qdf5c5r^AUdcH!SW`ui}2^LLxkM4>FSvaMgL22p`-;#O~=W zWMDmHMtQ?7BKkC6CHA{TLPM zb?3}kr?YcRRn?z$<@9V)r?KU=cC}@}@oVvB-i0-BE-%%}370>7R}=jwk857l?M~^dYH)9*Ra?Im(Oixq93E3wKR)I35EIW z%S=3qx|4Yym$AW8E<0R^^^I*nM%02bl`*Y~!0ysSmQ{F1fsYg7w*z$uHSF zOl~N`Uq8<#Y^+^i9WZ4UhNl4MbF2!VorRZYpe64m)?2SUPz20=!^T=+qX^$$f#v3} z%z&R*Yk6uJP+wu`dS=ChKFbeTH~ctRm5rK59J9te>2)$QYr|)Q0R}ciF$k>7y_jj#iW5C1gXi=A_Rn0L9BmzvUBci^xwz#efOJl z?worr*tHkz+RGnn^_wDfo5H!OSjaaA8;0yq=OPz6!Smc2D&O{BB}su;ev1n;ffy=3 z`L~i1oJ?$_L&L+W3E2h8tl<)nUaCwi=X2rdRTkKF%IHo~qF*WbFI}7oPF6zeYvm%v zz;w0Rxr8Dy!GzQfm93mlq~oe!l$7mIGbSb3ArqqA>bn4G(MxJFLKurn_`O=19;(fI zT*XO^lvyxfvcEo`7n4r1>T-Fso3+!$K(L>USaeV+XcnlyvdB6jaucipQsb;qrISc> z5_ZBMO1BpulqmXtW~59?h( zMc8kI1%ofy+5JS|U7OIfn~RUAs%RVcPGWXKe#egUFvMbfhm6f0E*S$~lrS2-w$k0a z4niHgUZ!9dpE~_XE+BiHH%oT!MDonc#>zNXrJNDu=y0m-Q0UkCs$2r>oaVJ$ zxTS4|&#r4Vva9%AByQZ)y!O%Ib%ml=eeOPvtK5nl8JxhH&9#S(lt;{M_t5;^U_AiWZh*w-^?jU2phlHvkd| z!Vc~X6O<0)H*!PnYa`i2DZ%?j%W1-?8h`62E_RB)bh_2wNWT<9OvQDkzBWD(5o24e73-_53Q|F0t&ddLX44fUQa2VsEfvSN z6sjS@sQbqh1i>GYR(sSUSPCLm(JGXMQnU@bEC>tfE{OWa)6BUO_1|~D^PTUWbLY&t zXqR5JORvn~6=fBb&Z#C*l3805@=cy9d+bo_bQe0oW8CT~-uStMLV-wjy$e%;2u7~? zH&7%v9IK?H{(jYj^i<`8;S!LXrM#W%rI}z?D1)0R7Cxb5k5eo-Tmtp~E0@R!#+IqA zKe;gnJxoZ{sBHeXL^7%hMo#HwHD!{M9Wo)@u6_wnEPPpwmlMYFVt&#EA|_P7P;0ll zXD2aGWI>n7-s~j7q){@?mKDq7cGgIb1Hn!i7|La3j6o)kn?Js>Cp0?g`^@q&f*dW{$gjQ zQW5q?VL|ri?VqK`3C77jq{WY+Q0K!Sl7Zg$siJ5_me^A-%(~j zLo2V8isVt=Au$eY_B*TXZ3Qc=&udmWRlteU1&qac{UEM_s~7kh={|Ic_t8K?@+Pl) zNUu1y&lj8Z?VJCa@OAGc0;kx7vgf|oOqWPa&Q#`|Z{b}Mq+e?$(l(7PIlaL4bKUPS{6cDLR`o59I}z~BG1 z{z?98;jBJ8Oty(tMI-wOhm%ErEGC@mEozgqjMshGMSRpW{-dSk*mZ^lM^+ks+75t3 zjIe`S!vv+-xI=2loHXLq!7~d>zkO$aJBE{VxE?OL)--OWJGgKcEJ#y{fn^{nN zUX)9x{F;nj7aj9RjS4|QPzFUx(3N-tu7+W8gRX(_i17ACzJ=UBqGKAl;3CnDuS6fz AJpcdz diff --git a/deps/osx/lib/libwebpdemux.a b/deps/osx/lib/libwebpdemux.a index 1fced66018cdc987c664fec6fb7277d60d0fc9b6..7b8b3a9d554d54166b474e18137dcc3b14674d3c 100644 GIT binary patch delta 40 ncmaEHh4IA|#tAa4W|l^#mKzlhGl5wan_n_{D?yo-s`{<~BM1zL delta 40 ncmaEHh4IA|#tAa4riP~G78?~0Gl5y=n_n_{D?yo-s`{<~A<_(a diff --git a/deps/osx/lib/libwebpmux.a b/deps/osx/lib/libwebpmux.a index ad23f5aef06a6ef311b8a17e04ad51bbad84b6d6..89035e344ad760e05ba5bf4d1212c8cd72d5e7fa 100644 GIT binary patch delta 63 zcmaDbljXromI*R!W|l^#mWCUZezCHGm=>EA*>2}UnT%!0mQZHqdTm`ObLJg)0|0*e B6Sn{W delta 64 zcmaDbljXromI*Q}riP~GlggwvT0LTA1+mRHE3)0rhcX$4aU(bWAuW{RJAhB3WUi>U1w}!hjA9&V+>-0aeh5vWP-~u jy&2<`@BCIKY?hHF4d delta 233 zcmX@Gn)ASF&IvNCriP~G#?uwwGm3AtDB)lOa}76d;&{aiV=oeGGKI0Vd`{KF*uPHC zGKR5d{r|)dF>0cs#P*f^jMZr{uK0F`GDZ_5*@>-;&4CD6gX@er>