diff options
author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2012-04-22 13:31:47 +0000 |
---|---|---|
committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2012-04-22 13:31:47 +0000 |
commit | 011198e5b6182245f05a15a8e85b7fde4c402e13 (patch) | |
tree | 976302fadf0d30a661d56bb80e4339911656afac /src/media/UMediaCore_FFmpeg.pas | |
parent | f3bc2f539e2de5e485762a3f953a6a60c748db63 (diff) | |
download | usdx-011198e5b6182245f05a15a8e85b7fde4c402e13.tar.gz usdx-011198e5b6182245f05a15a8e85b7fde4c402e13.tar.xz usdx-011198e5b6182245f05a15a8e85b7fde4c402e13.zip |
updates and extension for ffmpeg-0.8
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2867 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src/media/UMediaCore_FFmpeg.pas')
-rw-r--r-- | src/media/UMediaCore_FFmpeg.pas | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/media/UMediaCore_FFmpeg.pas b/src/media/UMediaCore_FFmpeg.pas index f04ee7eb..ffc7b1c5 100644 --- a/src/media/UMediaCore_FFmpeg.pas +++ b/src/media/UMediaCore_FFmpeg.pas @@ -199,7 +199,12 @@ begin inherited; CheckVersions(); + + {$IF LIBAVFORMAT_VERSION < 52110000} // 52.110.0 av_register_protocol(@UTF8FileProtocol); + {$ELSE} + av_register_protocol2(@UTF8FileProtocol, sizeof(UTF8FileProtocol)); + {$IFEND} AVCodecLock := SDL_CreateMutex(); end; @@ -228,6 +233,7 @@ end; function TMediaCore_FFmpeg.GetErrorString(ErrorNum: integer): string; begin +{$IF LIBAVUTIL_VERSION < 50043000} // < 50.43.0 case ErrorNum of AVERROR_IO: Result := 'AVERROR_IO'; AVERROR_NUMEXPECTED: Result := 'AVERROR_NUMEXPECTED'; @@ -239,6 +245,8 @@ begin AVERROR_PATCHWELCOME: Result := 'AVERROR_PATCHWELCOME'; else Result := 'AVERROR_#'+inttostr(ErrorNum); end; +{$ELSE} +{$IFEND} end; { @@ -371,7 +379,11 @@ begin Stream := TBinaryFileStream.Create(FilePath, Mode); h.priv_data := Stream; except +{$IF LIBAVUTIL_VERSION < 50043000} // < 50.43.0 Result := AVERROR_NOENT; +{$ELSE} + Result := -1; +{$IFEND} end; end; |