DELTA 427182 0 536 SVN!! UKV4ENDREP DELTA SVN$k$$x^mOF_7b )4 g/Pq8P" id9ù% :ݻ]ۻ;$H7q!3]̟4K"M~q>u>q\JnOV X4IzmDZqA<ʓ)alt5G2ϹajFFsxHgQNsX\nU1 WR΢_~1I.FHA)!1݄*ӱGIщBS?u5 :f|"{2yql@M8E-6SL\HQjRlPgRlR Z*%?mF> Od3!T٘lP遐 06@.۵vݮEBr,-E=TԞ7nmO_Ъ$MD4LQ'Mf^JE4|S l:˸zz2&`јA+.VU4+㪅"e,Td;U(QoTxS5j WV U*lE]*zjXfbjmTe]N@uE]w=( A{ME A~ Pt`t0jE``Iő|4{+x(Çl>&Bи;sS:S\ xPq cø8h1l j Bz,bÖ4"ðlfQfZ)!(k% AsP:P/b+be%^q[jZjZkZjZk5E5EmDQz-" Ǐ _(?M7#(',f~H&$1_|WY^iC^48&"͖4v|gNViR1< -enum PixelFormat imgfmt2pixfmt(int fmt); -int pixfmt2imgfmt(enum PixelFormat pix_fmt); +enum AVPixelFormat imgfmt2pixfmt(int fmt); +int pixfmt2imgfmt(enum AVPixelFormat pix_fmt); #endif /* MPLAYER_FMT_CONVERSION_H */ ENDREP DELTA SVN(e((x^oo0_/J[ 1ҮAĊW"q:Kl'4vCЪ= epI`PN: a7D/?۩y޿?s&@?O08p8IW,%{4PIn:]\,'9/2U w+AqG0Ee439;Ld_MŠ(sCgʕJDFNsB#v2JDc+D=njͳ#.MWfh7[oh-fهj gI{yGkGM \TҺ,pM*íAT&ml~[F>a@"']:Ms:ϛ0UMպ<:LolԑeuI_{U"W>\dXA;ɔ6aBciE8/Xf&ENDREP DELTA SVN(x^Tko0+*uaBI(R%&Xs,v(H$R4$p87!9BPvH8 <9~:z{pxry<> VQ:в{, yQ$R\|gݪRu PwH1t^lX>IdƉE!IS1'KQlPsk8U'SS9A*X,U˔+gئ|OE T^xs+48̀|mU NsК?IBZZ[Tyc!K *_ zL R`RIE@($"*I4:Gx]Ͻ ( 7N男Iw$7utlWz30އLI&¥1 4]-/ *)5Uل$ӬXy]ujNcRM1=)2}S}BTOn8Lq~ގpx=츍E+g R@94jKfº ><ȧb>OhFw <WoXGgYN\-V֛oR!: .Y{;ENDREP DELTA SVNQAQQx^}Oo6)^XvbP ; ) ٖbeȊw l? r>έ~ӭמ{W etD%oyDQ?N޿yгD"޴?r(_'"UϋL>>>^o|Mۻ$:ֲQ~Y2tn8v&wEb(AC Ԡ  ( f1;o(B %h!d`܄bLb(AC Ԡ  ( &Œ"PAA*0P@ M"PAA*0P@ Ŝ"PAA*0P@ M E 9$P ,T`$kC rHX@)4u(*C rHX@)4*3C rHX@)4Y(ZC rHX@)46+C rHX@)4U(C rHX@)4& C rHX@)4E(!4@ 2PRhPl(B %h!d`4h"өxjpVt|n]\o0lڱ .ah_oϫNQv]?W,PmS[g~FN+׷CGd=Lc۰8G$qH-1tc@Zu f˓v!N"yV@?̘9 H4`8cѹ=F~LĤj=v 1%ՉkK5tL.؊ oq˝BTB<צ: i! ص<'uL<# qrKbؼ4, +rW@7o7 )lMs؄_ 5b5j9F*quHH=jEtUvTM1 y`f)8ݦ,];& m{T@Ƀ ׭;'n;J@3:gШ3$i࠭̉ pRxQ3&:4P}_r&!.y NF&ƶw,TYo05v6#$(1DpȒf P|>)Y 6y)WDSC S *ctV]ɆlP; &S шnS5ި&#ujXәF%2/3Ǘy ,5Z)ڡRPk9h)fβӜš?{w1Υqnޞ\vn$Oq4,NM=;1>\'ޞn8#l;Yhxuh:7WxK  ̼Y By4z7qrj,4lJn"S'%=s?,;GHlJ."!)=H3b )0c3ʸ\*OF:v lդB:0 B u61eQV6nwt77V2QN z֔NkgG,o @g[:i^I5ʴHEXKC, @2@9S|0 fChv41=SZq5v-CS>į(݅x9.lW)=Pdƴ((_rɑ)fw)fN%'xXb Ty)UԴ7Vڃ6SBub (5m^ ф9WhxLc"G7g h+{tZwlo5 ?KJQYrVZCt\UTQYq^A!0# HR>~%"GleKwza^K M(P]5̾9~87PWFPT,u츽zY#DeQdve$.J,@4r!@KLCDu/S%T1?Y|uMY_ z5MkoUS ecv:|o>FpU`n\tZxjȒ H|$F'ٙ|5L1D{%e~6`VyyY? ]` Z *r䢬x<:M ^OA޵yvicYrnrD}=c|HD0eG>OU!'As69 ܗN"%riHy*4Q 5K췞Z6.X8Vsj_&_DqT/KR+2yS&^h;~qRv-cd@vHrJGDLY {: SL}R0y xQ줩CUb;YwZI nL͖KV_^;g:9<_;FLŵZbi]ju.̹9?W e*Ln_TV΄~ jc \I]Ai Jm1kBã:ޡ]fb2|aiCwn-)x;`+Vɟ;,MΦc_]c/(sݖj荭-t19a!J:2=ǺK)[.I3T6%Z KZu}Y҄ ?/%'QĀ ǔnCR!˽~>+s:Ge>$ޔ#h'K,"榠]88k}mԛ[wXe|yN@,2f@>SWSުX@dz*:Ka`k#t"ҷ۩ (.Z[pC#KVac].XkA- =O;UG 1 6ɬ;` D->0M'Ԋj't}N5=`[NsN(uHdSI!఍{,GO DY3،\qwn~sl\|=w`s/}UR¥$6E+`cZF7R +&ߊT>M\8_Ksa L(uq"DVȂ9sȪS)ؚ=4Ryߖ)zfu|+ɢ @ n-FE~8ꊀsFj e f?9JPQŞBmV_@p=Jʘ2MBgux ]8>*#{6qsMRxYI2QD(؅Wf&;!>w+h~[hlz^wPAh \TaV!BFđ/Ԣ}2+:Ҕ_[#AdMn>Y ŊB=SB"}ǰ>?';g5\>x .T1_'k3_ E( M2G5 .F4% .K&*PȈ5(Co8)J{'%*>gd+VWrCpj_39|e&(~I?}f}b!^uqn$*3k } lu@V[]*'-L+ +vblQD- ˪d/ңrbfL;('MScaoea280 J6 T`C! i_0O|\G,B"fENDREP DELTA SVN Z x^]O0_q. 1D"U3K5εYw;D MڞO7-Bb&_S"<'UR) Q՚6Zzm|5-: yc7:l!( < XX*͈D&B%L0 8H)Dѭ*jMԶ|[HB K$c+ڰv^aT2#Ld4makQF l7|{ ǿتNb)']7 ȂelEOhGWvο``XS^9|~,9L*+c~YܺENDREP DELTA SVNT2TTx^S[O0~ 6I(% CE 4MI"%nw miw.96MB~2~~P4dI&;E:6>qO-]׷Z`8Ft\OdR b BR9r-| 1b@}QZ,JŰ2+r\bzC'̳4qi<4}b1c6T9Cy6c}݄,9dAXs٥P?,%Ōu`PD5XiDWڨĒ?Ie,D"0൥tj,ڵ:[ nJ.p7 4Fa7 U*2I֍o7ʈ@k9ub Z޸8{}"wSR3Vj]l7*U񄎽ѕ7j`gQ4Ny7_&XF9ZǠ#:ORk+E%t lJwRZ+a򢠣3(JK*vt[*U9RX6<|sgqu0`wo6 vU |.AHzZ=ژy7^DX , ϘZ)`}\; Kfy6h fU6xA$]祥myuB NI8cENDREP DELTA SVNzmzzx^Wo69+n-ȶ[ʣ=oɲ0 Fx3A`$&$i%A$I˲ dQ%>.pC|b~%8c߃}69>gp Wrޛ) }=xb/,| oXq$?ھi*eЖxU phM =oi ~9 fl=k@=[m|K7i*H$0b1,$͎~&9!Acpx$ݍf3 cIcfOQ/濻J,f÷r5;UQ^d1X6@7 ~Bd%(L,z)@`GBA4,\;'cdLƦ|9* `}>rN8D"{剋/0D~!`Pz`@s&)&@p+=\g%B!?%F2W֒*ޟi@Gl=2F?u)zI 5'Ga ҙb KSq݆wZ9XBdwOY-zx %֏s,>QUeh@e?ChPpi,/ !^/ C͐S}CQ _s f|g8 A G1U@DǴVPf"t:;_*?88ۋw#(֙Qj[ZpyXoPn.A2#)C )K}@|$py-rdC#?Ɋ{ Q8헬.k:daPFLO;#uW$Ӷ{DZU zQ=ꢖ, E r^\˫ۅ7܋˫8ѧQ^K`^++~GZ*+nY9VNmrYUp b!;A;?k4ۙ ?T<_,ۤlIRN,)Mj#4|$ riO;7 =i%^})ٖ ԯQ+f"z=h* ^&`x|jcLx@FDޖd0 9MR}"Ϊ[S tQodQզ7nժR[3V`4Ad3D&fg#ewslb?4<<]oWMlܸˋQ K h쨏RqCk@+DЬxG?7}N5"@_ZENDREP DELTA SVN,x^_O0şOqp) ? "1)ݚ/wzC&W-+֜雝 J&NXoF޶a.e4p}nQj$YV)23\ͩb +7.ڸ ;:'RupN+*VAi:p3{.v\Ae;>Gdx@pUZɶhmA/Y઺ :Z 1y. 3ϦU/&0֒&yR6U6@ENDREP DELTA SVNgBggx^V[O:~N~ZtSn*g=\*Zh>E\KiNz er*83Mӄg^r:s5SJfZ˲ۦu`ZG`wc۾h4^ӿ~Ռh( ]N< /MB21Ns}m4Yt-XF]d%&fI {zjiϸZ$F!S:w9XM^ۣNӌ{K㔲EP^f9?.YgԔxؖCр4ϊd2ᢕ$4HŝI]\]_:?.|qX/͎?>֛8 m70vꄱ;c]{uS|)(WZj~݌5#]]DpswGc8y VBkB5?颪wBWEs2 fox;.NgAr.%ssH&+xm֯HlYRVeGH(dtm54H(* _ QH5O615"a*ѶQq-a[ARn15QKΖM |4ho&n(ح(aUpz'ƥYN;9 rN~kh~Tz<ʙI_}7X].W*S9V."L|ENDREP DELTA SVN)+))--- libmpcodecs/vf_scale.h.orig 2016-11-30 00:01:44 UTC +++ libmpcodecs/vf_scale.h @@ -19,7 +19,6 @@ #ifndef MPLAYER_VF_SCALE_H #define MPLAYER_VF_SCALE_H -int get_sws_cpuflags(void); struct SwsContext *sws_getContextFromCmdLine(int srcW, int srcH, int srcFormat, int dstW, int dstH, int dstFormat); struct SwsContext *sws_getContextFromCmdLine_hq(int srcW, int srcH, int srcFormat, int dstW, int dstH, int dstFormat); ENDREP DELTA SVN"!""x^K0Ɵ_q.d!8oi IM.s"f ^}G)R>U5י|3ˍ>k68Ix@^DEh0J&ah<.!l  .!T~`g rmq0NYY(퉼.wBP܊rtecUI-;?t} ל9G6]:I{Z\Dc3]໌@g.5%~%K@[|?ENDREP DELTA SVNfhff--- libmpcodecs/vf_smartblur.c.orig 2016-11-30 00:10:36 UTC +++ libmpcodecs/vf_smartblur.c @@ -61,7 +61,7 @@ static int allocStuff(FilterParam *f, in swsF.lumH= swsF.lumV= vec; swsF.chrH= swsF.chrV= NULL; f->filterContext= sws_getContext( - width, height, PIX_FMT_GRAY8, width, height, PIX_FMT_GRAY8, SWS_BICUBIC | get_sws_cpuflags(), &swsF, NULL, NULL); + width, height, AV_PIX_FMT_GRAY8, width, height, AV_PIX_FMT_GRAY8, SWS_BICUBIC, &swsF, NULL, NULL); sws_freeVec(vec); ENDREP DELTA 411632 246 411 SVNU+ h $!4Vf3-07-09 16:33:16@@ -383,9 +385,9 @@ static void handle_stream(demuxer_t *dem if (codec->codec_id == AV_CODEC_ID_RAWVIDEO) { switch (codec->pix_fmt) { - case PIX_FMT_RGB24: + case AV_PIX_FMT_RGB24: codec->codec_tag = MKTAG(24, 'B', 'G', 'R'); - case PIX_FMT_BGR24: + case AV_PIX_FMT_BGR24: codec->codec_tag = MKTAG(24, 'R', 'G', 'B'); } if (!codec->codec_tag) ENDREP DELTA SVN;C;;x^T[O0~&⌇*iHZĭ uB+u:dI-$rvg;΅2Iˋs9߱mUJQD;NJIqܮӁf憽vv`\IH"}I kh,M g#~ FdEX_d6,2b c/[ #b2L_I aplIF'G:]Y#1lG|*~Պf|:3Ѡ$&\ě0%f2*oB1/qFO?S=^XCdI:jaI׀95ƙު<^EF?"TiZS'D+^is!iաxrD$!撲zsj剪 B6 S,16~U{T@UWhբ}\-!]~}4Ew??`{7jCJ|= #6K/4Ǻg*)_ >'Y?T2+8okJ-Ga+'KrO{ûy`c9ENDREP DELTA SVN!v!!x^VmO8|+L+UM.KQ.Jr-E'NVH]8ZoWV"3=g&> '&w]((<8;כ=;z#L%M-$J3I)x~z`JdOD o #fruvz{.?Y}«tv-CCx+>a)Ip0[rx1r ƬhPo& "`c+0|MPCζ}q/q'9yǂA2h}_{QNhZK jX{XeOyQ `Ѣ!0$X;/^9dа'zb7X].aV ìwU,j EYp򛴖8F$O(𗕴M҂tހ+֫"(u3PbK\WFBMUci__}շ笐Q jMJT|!@k,)$],p%>;Ŀ/z `6^;#67|[8*|pM@\wÄmKKYsrOrsCmb<܆chOJ0za0T=0 ʦF~'X&c2 dE0߃J)>])t#kmxvDN  cu߼U4}$%Y\R8/$s:$c9JB^៤,j) L2`{h@dQ ]cJH C&F]Mvq/8Bdj mK-U$*-UVS3ߎnzpjlCxQ͙fq:BNVdAVO>Ē8p7W֟aiݻRÆQ_wULڴ g-;!O[ݚ_DfLxQF4C AENDREP DELTA SVN<x^J@oB춛i)X*bZ qw.D27VD)0g C)l^:ۼ]*Bi.ƆawNa1ؾpۣA? gPgZqXWJn05TftU^J|6XVUuVC ;O5ݶ6-ȥT[\>Wtz;~Frr"I8KUhY^fEc|9Kk 5L`` #ۖU [A