mirror of https://github.com/odrling/Aegisub
FFmpegSource2: 64bit fixing
Originally committed to SVN as r2371.
This commit is contained in:
parent
cbc6260786
commit
c0aa50f958
|
@ -447,7 +447,6 @@ MatroskaVideoSource::MatroskaVideoSource(const char *SourceFile, int Track,
|
|||
FrameIndex *TrackIndices, const char *PP,
|
||||
int Threads, char *ErrorMsg, unsigned MsgSize) {
|
||||
|
||||
unsigned int TrackMask = ~0;
|
||||
AVCodec *Codec = NULL;
|
||||
CodecContext = NULL;
|
||||
TrackInfo *TI = NULL;
|
||||
|
@ -567,7 +566,7 @@ int MatroskaVideoSource::DecodeNextFrame(AVFrame *AFrame, int64_t *AFirstStartTi
|
|||
int FrameFinished = 0;
|
||||
*AFirstStartTime = -1;
|
||||
|
||||
uint64_t StartTime, EndTime, FilePos;
|
||||
ulonglong StartTime, EndTime, FilePos;
|
||||
unsigned int Track, FrameFlags, FrameSize;
|
||||
|
||||
while (mkv_ReadFrame(MF, 0, &Track, &StartTime, &EndTime, &FilePos, &FrameSize, &FrameFlags) == 0) {
|
||||
|
|
|
@ -202,7 +202,7 @@ static FrameIndex *MakeMatroskaIndex(const char *SourceFile, int AudioTrackMask,
|
|||
for (unsigned int i = 0; i < mkv_GetNumTracks(MF); i++)
|
||||
TrackIndices->push_back(FrameInfoVector(mkv_TruncFloat(mkv_GetTrackInfo(MF, i)->TimecodeScale), 1000000));
|
||||
|
||||
uint64_t StartTime, EndTime, FilePos;
|
||||
ulonglong StartTime, EndTime, FilePos;
|
||||
unsigned int Track, FrameFlags, FrameSize;
|
||||
|
||||
while (mkv_ReadFrame(MF, 0, &Track, &StartTime, &EndTime, &FilePos, &FrameSize, &FrameFlags) == 0) {
|
||||
|
|
Loading…
Reference in New Issue