From e42ae2d19d89d7e86bf66b82354c2486422ae6ab Mon Sep 17 00:00:00 2001 From: Fredrik Mellbin Date: Wed, 22 Apr 2009 18:38:28 +0000 Subject: [PATCH] FFMS2: Various fixes to haali stuff Originally committed to SVN as r2837. --- aegisub/FFmpegSource2/ffms.cpp | 8 ------ aegisub/FFmpegSource2/ffms.h | 2 -- aegisub/FFmpegSource2/ffms2.html | 7 +++++ aegisub/FFmpegSource2/ffvideosource.cpp | 35 ++++++++++++++++++++----- aegisub/FFmpegSource2/ffvideosource.h | 2 +- aegisub/FFmpegSource2/indexing.cpp | 5 +--- 6 files changed, 37 insertions(+), 22 deletions(-) diff --git a/aegisub/FFmpegSource2/ffms.cpp b/aegisub/FFmpegSource2/ffms.cpp index 64cdce9c9..101151daa 100644 --- a/aegisub/FFmpegSource2/ffms.cpp +++ b/aegisub/FFmpegSource2/ffms.cpp @@ -185,14 +185,6 @@ FFMS_API(int) FFMS_FindClosestKeyFrame(FrameInfoVector *FIV, int Frame, char *Er } } -FFMS_API(int) FFMS_FrameFromDTS(FrameInfoVector *FIV, int64_t DTS) { - return FIV->FrameFromDTS(DTS); -} - -FFMS_API(int) FFMS_ClosestFrameFromDTS(FrameInfoVector *FIV, int64_t DTS) { - return FIV->ClosestFrameFromDTS(DTS); -} - FFMS_API(const TrackTimeBase *) FFMS_GetTimeBase(FrameInfoVector *FIV) { return &FIV->TB; } diff --git a/aegisub/FFmpegSource2/ffms.h b/aegisub/FFmpegSource2/ffms.h index a400f9a6d..93ed2390d 100644 --- a/aegisub/FFmpegSource2/ffms.h +++ b/aegisub/FFmpegSource2/ffms.h @@ -142,8 +142,6 @@ FFMS_API(FrameInfoVector *) FFMS_GetTITrackIndex(FrameIndex *TrackIndices, int T FFMS_API(FrameInfoVector *) FFMS_GetVSTrackIndex(VideoBase *VB); FFMS_API(FrameInfoVector *) FFMS_GetASTrackIndex(AudioBase *AB); FFMS_API(int) FFMS_FindClosestKeyFrame(FrameInfoVector *FIV, int Frame, char *ErrorMsg, unsigned MsgSize); -FFMS_API(int) FFMS_FrameFromDTS(FrameInfoVector *FIV, int64_t DTS); -FFMS_API(int) FFMS_ClosestFrameFromDTS(FrameInfoVector *FIV, int64_t DTS); FFMS_API(const TrackTimeBase *) FFMS_GetTimeBase(FrameInfoVector *FIV); FFMS_API(int) FFMS_WriteTimecodes(FrameInfoVector *FIV, const char *TimecodeFile, char *ErrorMsg, unsigned MsgSize); FFMS_API(FrameIndex *) FFMS_MakeIndex(const char *SourceFile, int IndexMask, int DumpMask, const char *AudioFile, bool IgnoreDecodeErrors, IndexCallback IP, void *Private, char *ErrorMsg, unsigned MsgSize); diff --git a/aegisub/FFmpegSource2/ffms2.html b/aegisub/FFmpegSource2/ffms2.html index 5751d3d06..4dfd0261b 100644 --- a/aegisub/FFmpegSource2/ffms2.html +++ b/aegisub/FFmpegSource2/ffms2.html @@ -233,6 +233,13 @@ Note that --enable-w32threads is required for multithreaded decoding to work.

Changes