mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

FFMS2: ICL compilation fix

Browse source 
Originally committed to SVN as r2959.
This commit is contained in:
Fredrik Mellbin 2009-05-21 10:05:53 +00:00
parent 6eb7206aa3
commit ccf24ae3af
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
aegisub/FFmpegSource2/coparser.h
View file

@ -12,7 +12,7 @@
// random access stream, this will be provided by // random access stream, this will be provided by
// IMMContainer's client // IMMContainer's client
[uuid("8E192E9F-E536-4027-8D46-664CC7A102C5")] interface __declspec(uuid("8E192E9F-E536-4027-8D46-664CC7A102C5")) IMMStream;
interface IMMStream : public IUnknown { interface IMMStream : public IUnknown {
// read count bytes starting at position // read count bytes starting at position
STDMETHOD(Read)( unsigned long long position, STDMETHOD(Read)( unsigned long long position,
@ -25,12 +25,12 @@ interface IMMStream : public IUnknown {
unsigned int signature) = 0; unsigned int signature) = 0;
}; };
[uuid("A237C873-C6AD-422E-90DB-7CB4627DCFD9")] interface __declspec(uuid("A237C873-C6AD-422E-90DB-7CB4627DCFD9")) IMMStreamOpen;
interface IMMStreamOpen : public IUnknown { interface IMMStreamOpen : public IUnknown {
STDMETHOD(Open)(LPCWSTR name) = 0; STDMETHOD(Open)(LPCWSTR name) = 0;
}; };
[uuid("D8FF7213-6E09-4256-A2E5-5872C798B128")] interface __declspec(uuid("D8FF7213-6E09-4256-A2E5-5872C798B128")) IMMFrame;
interface IMMFrame : public IMediaSample2 { interface IMMFrame : public IMediaSample2 {
// track number must be the same as returned by // track number must be the same as returned by
// IMMContainer->EnumTracks() iterator // IMMContainer->EnumTracks() iterator
@ -41,13 +41,13 @@ interface IMMFrame : public IMediaSample2 {
STDMETHOD(SetPre)(unsigned) = 0; STDMETHOD(SetPre)(unsigned) = 0;
}; };
[uuid("B8324E2A-21A9-46A1-8922-70C55D06311A")] interface __declspec(uuid("B8324E2A-21A9-46A1-8922-70C55D06311A")) IMMErrorInfo;
interface IMMErrorInfo : public IUnknown { interface IMMErrorInfo : public IUnknown {
STDMETHOD(LogError)(BSTR message) = 0; // message is owned by the caller STDMETHOD(LogError)(BSTR message) = 0; // message is owned by the caller
STDMETHOD(LogWarning)(BSTR message) = 0; STDMETHOD(LogWarning)(BSTR message) = 0;
}; };
[uuid("C7120EDB-528C-4ebe-BB53-DA8E70E618EE")] interface __declspec(uuid("C7120EDB-528C-4ebe-BB53-DA8E70E618EE")) IMemAlloc;
interface IMemAlloc : public IUnknown { interface IMemAlloc : public IUnknown {
STDMETHOD(GetBuffer)(HANDLE hAbortEvt, DWORD size, IMMFrame **pS) = 0; STDMETHOD(GetBuffer)(HANDLE hAbortEvt, DWORD size, IMMFrame **pS) = 0;
}; };
@ -58,7 +58,7 @@ interface IMemAlloc : public IUnknown {
// physical file it should return SegmentTop[UI8] property // physical file it should return SegmentTop[UI8] property
// that return the offset of the first byte after this // that return the offset of the first byte after this
// segment's end // segment's end
[uuid("A369001B-F292-45f7-A942-84F9C8C0718A")] interface __declspec(uuid("A369001B-F292-45f7-A942-84F9C8C0718A")) IMMContainer;
interface IMMContainer : public IUnknown { interface IMMContainer : public IUnknown {
STDMETHOD(Open)( IMMStream *stream, STDMETHOD(Open)( IMMStream *stream,
unsigned long long position, unsigned long long position,

2
aegisub/FFmpegSource2/utils.cpp
View file

@ -196,7 +196,7 @@ int FFIndex::ReadIndex(const char *IndexFile, char *ErrorMsg, unsigned MsgSize)
if (IH.LAVUVersion != LIBAVUTIL_VERSION_INT || IH.LAVFVersion != LIBAVFORMAT_VERSION_INT || if (IH.LAVUVersion != LIBAVUTIL_VERSION_INT || IH.LAVFVersion != LIBAVFORMAT_VERSION_INT ||
IH.LAVCVersion != LIBAVCODEC_VERSION_INT || IH.LSWSVersion != LIBSWSCALE_VERSION_INT || IH.LAVCVersion != LIBAVCODEC_VERSION_INT || IH.LSWSVersion != LIBSWSCALE_VERSION_INT ||
IH.LPPVersion != LIBPOSTPROC_VERSION_INT) { IH.LPPVersion != LIBPOSTPROC_VERSION_INT) {
_snprintf(ErrorMsg, MsgSize, "A different FFmpeg build was used to create this index", IndexFile); _snprintf(ErrorMsg, MsgSize, "A different FFmpeg build was used to create '%s'", IndexFile);
return 4; return 4;
} }