diff options
| author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-05-12 13:30:55 +0000 |
|---|---|---|
| committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-05-12 13:30:55 +0000 |
| commit | a289b5b40ec4a16eb05e2557b88c50f4de39840c (patch) | |
| tree | 6b4def631e4f0085c47ffbb39cfff996eb76114c /src | |
| parent | 07c7dc9d960a61bf99db9abb347af9f740e1dceb (diff) | |
| download | usdx-a289b5b40ec4a16eb05e2557b88c50f4de39840c.tar.gz usdx-a289b5b40ec4a16eb05e2557b88c50f4de39840c.tar.xz usdx-a289b5b40ec4a16eb05e2557b88c50f4de39840c.zip | |
fix No. 5 of ffmpeg update.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2367 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/ffmpeg/avcodec.pas | 4 | ||||
| -rw-r--r-- | src/lib/ffmpeg/avutil.pas | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/ffmpeg/avcodec.pas b/src/lib/ffmpeg/avcodec.pas index 7a78f06d..ee0cb983 100644 --- a/src/lib/ffmpeg/avcodec.pas +++ b/src/lib/ffmpeg/avcodec.pas @@ -4654,10 +4654,11 @@ function av_parse_video_frame_rate(frame_rate: PAVRational; str: {const} PAnsiCh cdecl; external av__codec; {$IFEND} +{$IF LIBAVCODEC_VERSION < 52059000} // <52.59.0 + { The following error codes are moved to libavutil/error.h on revision 22501 Mar 13 2010 - It is kept here for now. } {* error handling *} @@ -4687,7 +4688,6 @@ const {$ENDIF} {$ENDIF} -{$IF LIBAVCODEC_VERSION < 52059000} // <52.59.0 const {$IF EINVAL > 0} AVERROR_SIGN = -1; diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas index 0d11c4a5..cc1e3d44 100644 --- a/src/lib/ffmpeg/avutil.pas +++ b/src/lib/ffmpeg/avutil.pas @@ -141,7 +141,7 @@ function avutil_license(): PAnsiChar; cdecl; external av__format; {$IFEND} -{$IF LIBAVUTIL_VERSION >= 50014000} // >= 50.14.0 +{$IF LIBAVUTIL_VERSION >= 50020000} // >= 50.14.0 type TAVMediaType = ( AVMEDIA_TYPE_UNKNOWN = -1, |