From ea8841932b7fcd9a2fd9a23d523e01d598b46294 Mon Sep 17 00:00:00 2001 From: Karl Blomster Date: Sun, 17 May 2009 22:12:46 +0000 Subject: [PATCH] Update FFMS2 providers to account for FFMS2 API change in last commit. Also update ffms2.lib to corresponding version. Originally committed to SVN as r2948. --- aegisub/lib/ffms2.lib | Bin 8746 -> 8752 bytes aegisub/src/audio_provider_ffmpegsource.cpp | 4 ++-- aegisub/src/ffmpegsource_common.cpp | 2 +- aegisub/src/ffmpegsource_common.h | 2 +- aegisub/src/video_provider_ffmpegsource.cpp | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/aegisub/lib/ffms2.lib b/aegisub/lib/ffms2.lib index 63f6a273df2eb0b5f8633833d4ca1d1f0731ba98..3fd2174ea140cb9011352410d76a262be4a9259a 100644 GIT binary patch literal 8752 zcmcIp&2JM&6#wOe0^uVG`Tlk&6_f)dj-7y1wN9XJ1No8@=mp8R@rGE$c4Rw ziCZt6>A!#|C&ZZ|6{$CbR8E}u3lJ53GrKc8GdsK37*=}T-S;uSotgLMy%|q_o2zVW zeb@0#Ouwe$iFoq->}=w^&OhtDPMuH2-N)-40Oo+sr$F}`peF|OmRuUS2QZpkb!p-* zz-gTBM3awQ8f^y{4V-pqv_kJhW7k|7eNFE~LoZw!egrTYd+yT6DZ(KdyyH^;Jiut; ztxK_&0HcBXE)8u_J4A!;JUU8uqVbeVea`?!{SRE~eMS8t>bvSvjQYoD_>xQG56SLf zHoLI2x{_JXUi@M0LS|ugeI=9K+$>h($Yz(XEG`Dc_?63D>H1GsmM>>7&aKZOJ9n#4 z-7D3$R=0O=6iN%FLM@(3P&0+%PBu)KPA{!xe{^cAh1=<3%~ucdIp^m}q2?@<^3Ltl z)Qo7_CgHq{lgoR`tULTWECSA2%H8xDp4J=I1wPh#q3CRs^G?u z{Zu7fJ6$N{FKm~qPPKN~*-KY)MaKjRQ;}$u+{VpxrCglb%@@iR%z!*#d9{#tqAaC6 zU}>EsHUt9HR}i+mlMAKIve{8G(`CY9dAG;~)nMl|kw7!431HtPL_(h$;U@O> zeUZ>l7b;b^hbx=BEyGD!M{FwG{vu6vrM#C;yCWkbCq&5E8K>&hR(5MUyR~$=Qp}kV zWR-KvHN!5h^!hC@9g(m-!)k=BC zsniM-iFzNzC+P~pmbrCIa8f%kp@DdY73rC#9P2(UT{+?}ATNA#GU+ed-Z13-oD*T#U?bbm1fJQ@a`)B7p1 zxibjN_XBUq=4A}HPx@P=^N#pOiBeP%JnI7G=>A3AUtM{xw*7{PHIz<%^0hJJj3gJ?l(lP$D`=4Qn?Ovh40 zR=4=Dmn$n7Z_Kk$Tcd#Gq7S7q{&6Yhvs^tovcs2Hvg1pVwuqREltAEonT`ZE;KJ0V zHP>jlLs-U_BBj!5xL%E}K$S(`zJLZ4R0lSeQF~A*EqDq_Xat37`!s5b zLRgq6D&!=7uvqx|lCgXn31+SI~IH`0Pj7x^Kk^VL8z zB%&mh;T9tIgDylthMq+(YD-;Y2}4Ce1f#;zLsAjwfvE|qMy;nim6632OIxTaVk2Np zi59jYdq%#KJd@wv_R{@_cJPUFNpCNIy<@SZ4ZFW}UE1FQ%9#9WIg@vO*}ZXM&3y&F zrw7`;YgYCJd-%G1DqL_&}8Q;0ojrF$3U zYIYrzojQr0uKmPet+9*A$1}&43LBMjwY*u2oyvS2TU=Pa%%#T9VR~nVtN~U+u%|Bi z-N&CK22va4;tqZ1c;TBf&8cc{=IJ6flQ#1rQf4{7Bd@+WC*cNM7jxdsIART8Nm3{2^Yv zJM$3M?kAr4dS;ZWQyS%v1Db}%Y&M~cnHyFA5J1$JMMPE78y@boEUMH?iK>L)GiUu< zymDg20W7UvmQWuNqY)!}P(`&B z;Z5L1jckX8D=K>*Og_~+vLcNbvv{0l@lXKEKlzh5zU$VD=$-k*48#~A9u6Ri9Y_;+ z;;$qFj}=8nR6J!@(*)X-eO;d*w4*ATx>NGu8qXsUc%25GJp66~FUmK&R6Mz-^TFg( zy`B;=bKNSIvQLy4jr-+{edbQk%pKFv%)Mt5m=PJH$BHTUvp#6!J`>T?UMs5DB>SN9 zsouGa@YB8krnm8yARn=IM~rO0iWl6?H-VZ6sX6EXn$D0#PV|lln!yRlOl*rWC~>rN zhtGsIB+<0Pj3&^M5#BkhpaoAzd{FsRuXjeQG$RsIKXs89jjuG~K*Y#MU()Q2s%YB3 lg!FHp57~IkNAz$^V(Q03KAe22cRVAiig6uHJ93gZ_#ea(yVL*x literal 8746 zcmcIqOLG%P5NkUB9C_wLRmm-e<2o1e-DY^qd zs4weM?`zaU8klma|1tof(YG#*JOCgx_}-)0LgRxT-N!f5#Ij2xlh{9`zUPGU z`Si;AS~izo`eEa0Hocx(%jQ$5m5mtW^Q+f0nOZUYLglVB_tW*&Yx$*x+ydkm4(-a( zzO%EwTfJrPr}u3qmW*RF_TE9>Pe_`|6V>E2(^OdW<44QMlx}6LLu*%4(1FM}i zE68=_c8zs41zHzpEJs1t%cTRW?ATUCEK-mLm(f-OYa29J?Nqt2XC-ImlqtqO3BIDa zc$BkIUz=8@FG*P~3au|8>I**AL>pPFItNuJRVwcloMcR$Ka-f&%UTt!rdrV`r!~Fh zOr_HMMeD9M<+VaKo|Ij#IJt6R>(1JC?&!ccbtV;7f3>5ixzLOo7ya5wjt^ zU?QfEjnJhtw=YCYKSx>V{q2&$2s9zDlcvz_#MPQkP8YL!H#VetHN(-Rv{uUAFJ9d( zRnR%FSx3SsrTxH9g`pCIT`W{AZHdVQN)oF5bJ=z*!rdwr(G9hs8Kkt&c&?i zMyi17X01Zen>Te=Qw5?o#!03<5fZA6<5{=wruLlLaSA@wT(Y(c)m_&ESBdv)-fWWB zAKB-4WXI43&pH6!bYYzA0l3`@@F)WCatL523Xtssc#XWN0f5W>0B=VD9*h9I$9Q=Y zb-MBW3iaNN13X6gJ^X$=4DezMU=iP~sDFrb1>1axZEPa{$ppr3)W46kjO9se?>XXN ziUF-~3ci3zI1N3}4kOSBy>JdX;3Nz{A56em7=$4>1EbIn!*Bv3Fb>_&23-(^F=&G3 z23u(Hjm&g;0%DXoHu^8BC!v9jZn$1VMcIFZqxvl|4z7DE?F<5?-Z>gm0;QlZR;@mncb%&v}t- z2(b&r-CZx(A9s3>Urc!C_|5iAQwxm$dv>|42{5+Or|Ck`x>>z7wc&mOe2;}+*@yQ| zLg(TIyI61vQ!ysOQ~>@&`p09m;5!M^Pd&XkkBzY#;6Eg$NBBvIK5fQ#C&qa4oZ^Ez z4?Uf2$RVwfhsYz@?iG8hT&k3|o#;2&Z=;#?>NP6Wex1Q@Qjs)35(rZ2#NQ`qiDN)= ztF(83{fuOPgAX4V7||yW=~y$c;U)oSS9chP4ve6*FixE4AOpBgLU0HlGamks)&b`E zH^ExPuTOWO(9Q=M(n4bKi;{&jQw#Y6yX1Bij22Rq20)6Eh0HP$v5?={hxaBHLfZYr zD<5V>G2g^l_PLy?d(P(L(wwbCjBytjN&74a*?Ya)oG?YuF$ z`An$fydtB@84G4ijiAn%$2x^$ZQ-b_5z!*=- zSf&)5gVk?CL1S!Ja9Lh2z<4R_7+Da}=5rF~^K=cCI4f`*VMJjO*&lT@M3SPMkrAcy zM+0axW;-26w6ijre5Mg__3!Edc;_@ceo$%vFUVFpWITTQ5@5U(cI8--rmfu9IG3F= zmf=LlvFf*%fE~39w0n1BaS2VyE zdlgi1M&=mxuVjF4^eJf4xm&>1zm5TWTfdB_9p(ijFNK`XxR0&kWi#Fxv*_eq5b(x7 zB0~5?CUU?SIndexingCanceled) diff --git a/aegisub/src/ffmpegsource_common.h b/aegisub/src/ffmpegsource_common.h index abb6900ef..a2db3725f 100644 --- a/aegisub/src/ffmpegsource_common.h +++ b/aegisub/src/ffmpegsource_common.h @@ -59,7 +59,7 @@ public: static wxMutex CleaningInProgress; bool CleanCache(); - static int FFMS_CC UpdateIndexingProgress(int State, int64_t Current, int64_t Total, void *Private); + static int FFMS_CC UpdateIndexingProgress(int64_t Current, int64_t Total, void *Private); FFIndex *DoIndexing(FFIndex *Index, wxString Filename, wxString Cachename, int Trackmask, bool IgnoreDecodeErrors); wxString GetCacheFilename(const wxString& filename); diff --git a/aegisub/src/video_provider_ffmpegsource.cpp b/aegisub/src/video_provider_ffmpegsource.cpp index d5d9282ae..c91e7fb4e 100644 --- a/aegisub/src/video_provider_ffmpegsource.cpp +++ b/aegisub/src/video_provider_ffmpegsource.cpp @@ -149,10 +149,10 @@ void FFmpegSourceVideoProvider::LoadVideo(Aegisub::String filename, double fps) } // load video properties - VideoInfo = FFMS_GetTVideoProperties(VideoSource); + VideoInfo = FFMS_GetVideoProperties(VideoSource); // get frame info data - FFTrack *FrameData = FFMS_GetVSTrackIndex(VideoSource); + FFTrack *FrameData = FFMS_GetTrackFromVideo(VideoSource); if (FrameData == NULL) throw _T("FFmpegSource video provider: failed to get frame data"); const TTrackTimeBase *TimeBase = FFMS_GetTimeBase(FrameData); @@ -163,7 +163,7 @@ void FFmpegSourceVideoProvider::LoadVideo(Aegisub::String filename, double fps) // build list of keyframes and timecodes for (int CurFrameNum = 0; CurFrameNum < VideoInfo->NumFrames; CurFrameNum++) { - CurFrameData = FFMS_GetTFrameInfo(FrameData, CurFrameNum, FFMSErrorMessage, MessageSize); + CurFrameData = FFMS_GetFrameInfo(FrameData, CurFrameNum, FFMSErrorMessage, MessageSize); if (CurFrameData == NULL) { wxString temp(FFMSErrorMessage, wxConvUTF8); ErrorMsg << _T("Couldn't get framedata for frame ") << CurFrameNum << _T(": ") << temp;